diff --git a/kodi.spec b/kodi.spec
index 6e668ea..6f8500e 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -12,11 +12,19 @@
 %define pkgver %(echo %version | cut -d_ -f1)
 %define pkgrel %(echo %version | cut -d_ -f2)
 
-%define codenameadd -Nexus
-#%define ffmpeg_ver 4.3.2%{codenameadd}-19.1
+%define codenameadd -Omega
+%define _libdvdcss_version 1.4.3-Next-Nexus-Alpha2-2
+%define _libdvdnav_version 6.1.1-Next-Nexus-Alpha2-2
+%define _libdvdread_version 6.1.3-Next-Nexus-Alpha2-2
+%define _ffmpeg_version 6.0.1
+%define _crossguid_version ca1bf4b810e2d188d04cb6286f957008ee1b7681
+%define _fstrcmp_version 0.7.D001
+%define _flatbuffers_version 23.3.3
+%define _libudfread_version 1.1.2
+
 
 Name:          kodi
-Version:       20.5
+Version:       21.0
 Release:       1mamba
 Summary:       A media player and entertainment hub for digital media
 Group:         Graphical Desktop/Applications/Multimedia
@@ -25,13 +33,19 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://kodi.tv/
 Source:        https://github.com/xbmc/xbmc/archive/%{version}%{?codenameadd}.tar.gz
-Source1:       https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz
+Source1:       https://github.com/xbmc/libdvdcss/archive/%{_libdvdcss_version}.tar.gz
+Source2:       https://github.com/xbmc/libdvdnav/archive/%{_libdvdnav_version}.tar.gz
+Source3:       https://github.com/xbmc/libdvdread/archive/%{_libdvdread_version}.tar.gz
+Source4:       https://ffmpeg.org/releases/ffmpeg-%{_ffmpeg_version}.tar.gz
+Source5:       https://mirrors.kodi.tv/build-deps/sources/crossguid-%{_crossguid_version}.tar.gz
+Source6:       https://mirrors.kodi.tv/build-deps/sources/fstrcmp-%{_fstrcmp_version}.tar.gz
+Source7:       https://mirrors.kodi.tv/build-deps/sources/flatbuffers-%{_flatbuffers_version}.tar.gz
+Source8:       https://mirrors.kodi.tv/build-deps/sources/libudfread-%{_libudfread_version}.tar.gz
 Patch1:        xbmc-12.0-set_native_cxxflags.patch
 Patch2:        xbmc-12.0-relax_badcolordepth_check.patch
 Patch3:        kodi-20.2-binutils-2.41.patch
 Patch4:        kodi-20.4-swig-4.2.0.patch
 License:       GPL
-
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libX11-devel
@@ -110,6 +124,7 @@ BuildRequires: trousers-devel
 ## AUTOBUILDREQ-END
 BuildRequires: doxygen
 BuildRequires: gperf
+BuildRequires: java-openjdk17
 BuildRequires: nasm
 BuildRequires: swig
 BuildRequires: unzip
@@ -124,6 +139,7 @@ BuildRequires: libmpeg2-devel
 BuildRequires: libogg-devel
 BuildRequires: librtmp-devel
 BuildRequires: libusb-devel
+BuildRequires: libtinyxml2-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libzip-devel
 %if "%{?_with_raspberrypi}"
@@ -179,17 +195,29 @@ XBMC is an award-winning free and open source (GPL) software media player and en
 %patch 2 -p1
 %endif
 
-%patch 3 -p1
-%patch 4 -p1
+#%patch 3 -p1
+#%patch 4 -p1
 
 %build
 export JAVA_HOME=%{jvmdir}/java-17
 #:<< ___EOF
 %cmake -d build \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL="%{SOURCE1}" \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DENABLE_INTERNAL_UDFREAD=ON \
+	-Dlibdvdcss_URL="%{SOURCE1}" \
+    -Dlibdvdnav_URL="%{SOURCE2}" \
+    -Dlibdvdread_URL="%{SOURCE3}" \
+    -DFFMPEG_URL="%{SOURCE4}" \
+    -DCROSSGUID_URL="%{SOURCE5}" \
+    -DFSTRCMP_URL="%{SOURCE6}" \
+    -DFLATBUFFERS_URL="%{SOURCE7}" \
+    -DUDFREAD_URL="%{SOURCE8}" \
 %ifarch x86_64 %{ix86}
-   -DAPP_RENDER_SYSTEM="gl"
+   -DAPP_RENDER_SYSTEM="gl" \
 %endif
 %ifarch aarch64 arm
    -DAPP_RENDER_SYSTEM="gles"
@@ -250,11 +278,12 @@ fi
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
-%{_bindir}/JsonSchemaBuilder
+%{_bindir}/TexturePacker
 %dir %{_datadir}/kodi
 %{_datadir}/kodi/*
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
+%{_datadir}/wayland-sessions/kodi-gbm.desktop
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_prefix}/lib/firewalld/services/kodi-*.xml
@@ -269,6 +298,9 @@ fi
 %doc README.md
 
 %changelog
+* Thu Apr 11 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 21.0-1mamba
+- update to 21.0
+
 * Sun Mar 03 2024 Automatic Build System <autodist@openmamba.org> 20.5-1mamba
 - automatic version update by autodist