Request 5661 (accepted)

Overview

Request 5661 (accepted)

Version Update Kodi 20.0 Nexus

Created by sagiben almost 2 years ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:sagiben / kodi to package Multimedia / kodi

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -18,8 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Matrix
-%define ffmpeg_version 4.3.2-Matrix-19.2
+%define kodi_version Nexus
+%define ffmpeg_version 4.4.1-Nexus-Alpha1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        19.5
+Version:        20.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,12 +65,13 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source21:       libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
-Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
+Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
+Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
+Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
 ## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 ## endif
@@ -81,6 +82,7 @@
 #Patch3:         crossguid_build64.patch
 #Patch4:         kodi.aarch64.patch
 #Patch5:         kodi-tools-libdir.patch
+
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
@@ -89,7 +91,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-Patch12:        fix_import_eglextchromium.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -346,16 +347,16 @@
 #%patch3
 #%patch4
 #%patch5
+
 %patch6
-%patch7
+# %patch7
+#%patch8 -p1
 %if %{without sysffmpeg}
 %patch11
 %endif
-#%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
 %endif
-%patch12 -p1
 
 %build
 
@@ -479,13 +480,6 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
-    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
-	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
-	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
-	rmdir %{buildroot}/%{_libdir}/kodi/cmake
-fi
-
 %fdupes %{buildroot}
 
 %pre
@@ -508,7 +502,7 @@
 %endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
-%{_bindir}/TexturePacker
+%{_bindir}/kodi-TexturePacker
 %{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
@@ -534,6 +528,10 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
+%dir %{_kodi_addons_dir}/game.controller.keyboard
+%{_kodi_addons_dir}/game.controller.keyboard/*
+%dir %{_kodi_addons_dir}/game.controller.mouse
+%{_kodi_addons_dir}/game.controller.mouse/*
 %dir %{_kodi_addons_dir}/game.controller.snes
 %{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
@@ -544,22 +542,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
-%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
-%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
-%{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
@@ -646,6 +636,7 @@
 %{_kodi_addons_dir}/metadata.generic.artists/*
 %dir %{_kodi_addons_dir}/kodi.binary.global.tools
 %{_kodi_addons_dir}/kodi.binary.global.tools/*
+
 %dir %{_libdir}/firewalld
 %dir %{_libdir}/firewalld/services
 %{_libdir}/firewalld/services/kodi-eventserver.xml
@@ -659,7 +650,6 @@
 %endif
 
 %dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/KodiConfig.cmake
 %{_datadir}/kodi/cmake/AddonHelpers.cmake
 %{_datadir}/kodi/cmake/AddOptions.cmake
 %{_datadir}/kodi/cmake/ArchSetup.cmake
@@ -672,7 +662,10 @@
 %{_datadir}/kodi/cmake/PrepareEnv.cmake
 %{_datadir}/kodi/cmake/ProjectMacros.cmake
 %{_datadir}/kodi/cmake/PathSetup.cmake
+%dir %{_libdir}/kodi/cmake
+%{_libdir}/kodi/cmake/KodiConfig.cmake
 
+%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 
 %files devel
 %defattr(-,root,root)
@@ -727,11 +720,5 @@
 %{_includedir}/kodi/platform/android/System.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/*
-# %{_includedir}/kodi/AEChannelData.h
-# %{_includedir}/kodi/DemuxCrypto.h
-# %{_includedir}/kodi/DemuxPacket.h
-# %{_includedir}/kodi/InputStreamConstants.h
-# %{_includedir}/kodi/TimingConstants.h
-# %{_includedir}/kodi/XBMC_vkeys.h
 
 %changelog

kodi-noX-raspberry-pi2.spec Changed

@@ -18,8 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Matrix
-%define ffmpeg_version 4.3.2-Matrix-19.2
+%define kodi_version Nexus
+%define ffmpeg_version 4.4.1-Nexus-Alpha1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        19.5
+Version:        20.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,12 +65,13 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source21:       libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
-Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
+Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
+Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
+Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
 ## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 ## endif
@@ -81,6 +82,7 @@
 #Patch3:         crossguid_build64.patch
 #Patch4:         kodi.aarch64.patch
 #Patch5:         kodi-tools-libdir.patch
+
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
@@ -89,7 +91,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-Patch12:        fix_import_eglextchromium.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -346,16 +347,16 @@
 #%patch3
 #%patch4
 #%patch5
+
 %patch6
-%patch7
+# %patch7
+#%patch8 -p1
 %if %{without sysffmpeg}
 %patch11
 %endif
-#%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
 %endif
-%patch12 -p1
 
 %build
 
@@ -479,13 +480,6 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
-    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
-	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
-	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
-	rmdir %{buildroot}/%{_libdir}/kodi/cmake
-fi
-
 %fdupes %{buildroot}
 
 %pre
@@ -508,7 +502,7 @@
 %endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
-%{_bindir}/TexturePacker
+%{_bindir}/kodi-TexturePacker
 %{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
@@ -534,6 +528,10 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
+%dir %{_kodi_addons_dir}/game.controller.keyboard
+%{_kodi_addons_dir}/game.controller.keyboard/*
+%dir %{_kodi_addons_dir}/game.controller.mouse
+%{_kodi_addons_dir}/game.controller.mouse/*
 %dir %{_kodi_addons_dir}/game.controller.snes
 %{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
@@ -544,22 +542,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
-%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
-%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
-%{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
@@ -646,6 +636,7 @@
 %{_kodi_addons_dir}/metadata.generic.artists/*
 %dir %{_kodi_addons_dir}/kodi.binary.global.tools
 %{_kodi_addons_dir}/kodi.binary.global.tools/*
+
 %dir %{_libdir}/firewalld
 %dir %{_libdir}/firewalld/services
 %{_libdir}/firewalld/services/kodi-eventserver.xml
@@ -659,7 +650,6 @@
 %endif
 
 %dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/KodiConfig.cmake
 %{_datadir}/kodi/cmake/AddonHelpers.cmake
 %{_datadir}/kodi/cmake/AddOptions.cmake
 %{_datadir}/kodi/cmake/ArchSetup.cmake
@@ -672,7 +662,10 @@
 %{_datadir}/kodi/cmake/PrepareEnv.cmake
 %{_datadir}/kodi/cmake/ProjectMacros.cmake
 %{_datadir}/kodi/cmake/PathSetup.cmake
+%dir %{_libdir}/kodi/cmake
+%{_libdir}/kodi/cmake/KodiConfig.cmake
 
+%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 
 %files devel
 %defattr(-,root,root)
@@ -727,11 +720,5 @@
 %{_includedir}/kodi/platform/android/System.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/*
-# %{_includedir}/kodi/AEChannelData.h
-# %{_includedir}/kodi/DemuxCrypto.h
-# %{_includedir}/kodi/DemuxPacket.h
-# %{_includedir}/kodi/InputStreamConstants.h
-# %{_includedir}/kodi/TimingConstants.h
-# %{_includedir}/kodi/XBMC_vkeys.h
 
 %changelog

kodi-noX.spec Changed

@@ -18,8 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Matrix
-%define ffmpeg_version 4.3.2-Matrix-19.2
+%define kodi_version Nexus
+%define ffmpeg_version 4.4.1-Nexus-Alpha1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        19.5
+Version:        20.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,12 +65,13 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source21:       libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
-Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
+Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
+Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
+Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
 ## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 ## endif
@@ -81,6 +82,7 @@
 #Patch3:         crossguid_build64.patch
 #Patch4:         kodi.aarch64.patch
 #Patch5:         kodi-tools-libdir.patch
+
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
@@ -89,7 +91,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-Patch12:        fix_import_eglextchromium.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -346,16 +347,16 @@
 #%patch3
 #%patch4
 #%patch5
+
 %patch6
-%patch7
+# %patch7
+#%patch8 -p1
 %if %{without sysffmpeg}
 %patch11
 %endif
-#%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
 %endif
-%patch12 -p1
 
 %build
 
@@ -479,13 +480,6 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
-    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
-	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
-	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
-	rmdir %{buildroot}/%{_libdir}/kodi/cmake
-fi
-
 %fdupes %{buildroot}
 
 %pre
@@ -508,7 +502,7 @@
 %endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
-%{_bindir}/TexturePacker
+%{_bindir}/kodi-TexturePacker
 %{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
@@ -534,6 +528,10 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
+%dir %{_kodi_addons_dir}/game.controller.keyboard
+%{_kodi_addons_dir}/game.controller.keyboard/*
+%dir %{_kodi_addons_dir}/game.controller.mouse
+%{_kodi_addons_dir}/game.controller.mouse/*
 %dir %{_kodi_addons_dir}/game.controller.snes
 %{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
@@ -544,22 +542,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
-%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
-%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
-%{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
@@ -646,6 +636,7 @@
 %{_kodi_addons_dir}/metadata.generic.artists/*
 %dir %{_kodi_addons_dir}/kodi.binary.global.tools
 %{_kodi_addons_dir}/kodi.binary.global.tools/*
+
 %dir %{_libdir}/firewalld
 %dir %{_libdir}/firewalld/services
 %{_libdir}/firewalld/services/kodi-eventserver.xml
@@ -659,7 +650,6 @@
 %endif
 
 %dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/KodiConfig.cmake
 %{_datadir}/kodi/cmake/AddonHelpers.cmake
 %{_datadir}/kodi/cmake/AddOptions.cmake
 %{_datadir}/kodi/cmake/ArchSetup.cmake
@@ -672,7 +662,10 @@
 %{_datadir}/kodi/cmake/PrepareEnv.cmake
 %{_datadir}/kodi/cmake/ProjectMacros.cmake
 %{_datadir}/kodi/cmake/PathSetup.cmake
+%dir %{_libdir}/kodi/cmake
+%{_libdir}/kodi/cmake/KodiConfig.cmake
 
+%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 
 %files devel
 %defattr(-,root,root)
@@ -727,11 +720,5 @@
 %{_includedir}/kodi/platform/android/System.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/*
-# %{_includedir}/kodi/AEChannelData.h
-# %{_includedir}/kodi/DemuxCrypto.h
-# %{_includedir}/kodi/DemuxPacket.h
-# %{_includedir}/kodi/InputStreamConstants.h
-# %{_includedir}/kodi/TimingConstants.h
-# %{_includedir}/kodi/XBMC_vkeys.h
 
 %changelog

kodi.spec Changed

@@ -18,8 +18,8 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Matrix
-%define ffmpeg_version 4.3.2-Matrix-19.2
+%define kodi_version Nexus
+%define ffmpeg_version 4.4.1-Nexus-Alpha1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
@@ -53,7 +53,7 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        19.5
+Version:        20.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,12 +65,13 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source21:       libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
-Source22:       https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/6.0.0-Leia-Alpha-3.tar.gz
-Source23:       libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
+Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
+Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
+# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
+Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
 ## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 ## endif
@@ -81,6 +82,7 @@
 #Patch3:         crossguid_build64.patch
 #Patch4:         kodi.aarch64.patch
 #Patch5:         kodi-tools-libdir.patch
+
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
@@ -89,7 +91,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-Patch12:        fix_import_eglextchromium.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -346,16 +347,16 @@
 #%patch3
 #%patch4
 #%patch5
+
 %patch6
-%patch7
+# %patch7
+#%patch8 -p1
 %if %{without sysffmpeg}
 %patch11
 %endif
-#%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
 %endif
-%patch12 -p1
 
 %build
 
@@ -479,13 +480,6 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
-    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
-	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
-	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
-	rmdir %{buildroot}/%{_libdir}/kodi/cmake
-fi
-
 %fdupes %{buildroot}
 
 %pre
@@ -508,7 +502,7 @@
 %endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
-%{_bindir}/TexturePacker
+%{_bindir}/kodi-TexturePacker
 %{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
@@ -534,6 +528,10 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
+%dir %{_kodi_addons_dir}/game.controller.keyboard
+%{_kodi_addons_dir}/game.controller.keyboard/*
+%dir %{_kodi_addons_dir}/game.controller.mouse
+%{_kodi_addons_dir}/game.controller.mouse/*
 %dir %{_kodi_addons_dir}/game.controller.snes
 %{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
@@ -544,22 +542,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
-%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
-%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
-%{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
 %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
@@ -646,6 +636,7 @@
 %{_kodi_addons_dir}/metadata.generic.artists/*
 %dir %{_kodi_addons_dir}/kodi.binary.global.tools
 %{_kodi_addons_dir}/kodi.binary.global.tools/*
+
 %dir %{_libdir}/firewalld
 %dir %{_libdir}/firewalld/services
 %{_libdir}/firewalld/services/kodi-eventserver.xml
@@ -659,7 +650,6 @@
 %endif
 
 %dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/KodiConfig.cmake
 %{_datadir}/kodi/cmake/AddonHelpers.cmake
 %{_datadir}/kodi/cmake/AddOptions.cmake
 %{_datadir}/kodi/cmake/ArchSetup.cmake
@@ -672,7 +662,10 @@
 %{_datadir}/kodi/cmake/PrepareEnv.cmake
 %{_datadir}/kodi/cmake/ProjectMacros.cmake
 %{_datadir}/kodi/cmake/PathSetup.cmake
+%dir %{_libdir}/kodi/cmake
+%{_libdir}/kodi/cmake/KodiConfig.cmake
 
+%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
 
 %files devel
 %defattr(-,root,root)
@@ -727,11 +720,5 @@
 %{_includedir}/kodi/platform/android/System.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/*
-# %{_includedir}/kodi/AEChannelData.h
-# %{_includedir}/kodi/DemuxCrypto.h
-# %{_includedir}/kodi/DemuxPacket.h
-# %{_includedir}/kodi/InputStreamConstants.h
-# %{_includedir}/kodi/TimingConstants.h
-# %{_includedir}/kodi/XBMC_vkeys.h
 
 %changelog

fix_import_eglextchromium.patch Deleted

@@ -1,38 +0,0 @@
-diff -rup xbmc-19.5-Matrix.orig/cmake/modules/FindEGL.cmake xbmc-19.5-Matrix/cmake/modules/FindEGL.cmake
---- xbmc-19.5-Matrix.orig/cmake/modules/FindEGL.cmake	2022-12-24 10:29:16.000000000 +0100
-+++ xbmc-19.5-Matrix/cmake/modules/FindEGL.cmake	2023-01-02 10:03:58.893374532 +0100
-@@ -9,6 +9,7 @@
- # EGL_INCLUDE_DIRS - the EGL include directory
- # EGL_LIBRARIES - the EGL libraries
- # EGL_DEFINITIONS - the EGL definitions
-+# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h
- #
- # and the following imported targets::
- #
-@@ -35,6 +36,11 @@ if(EGL_FOUND)
-   set(EGL_LIBRARIES ${EGL_LIBRARY})
-   set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
-   set(EGL_DEFINITIONS -DHAS_EGL=1)
-+  include(CheckIncludeFiles)
-+  check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
-+  if(HAVE_EGLEXTANGLE)
-+    list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1")
-+  endif()
- 
-   if(NOT TARGET EGL::EGL)
-     add_library(EGL::EGL UNKNOWN IMPORTED)
-diff -rup xbmc-19.5-Matrix.orig/xbmc/windowing/X11/GLContextEGL.h xbmc-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h
---- xbmc-19.5-Matrix.orig/xbmc/windowing/X11/GLContextEGL.h	2022-12-24 10:29:16.000000000 +0100
-+++ xbmc-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h	2023-01-02 10:04:44.765337785 +0100
-@@ -13,7 +13,11 @@
- #include "threads/CriticalSection.h"
- 
- #include <EGL/eglext.h>
-+#ifdef HAVE_EGLEXTANGLE
-+#include <EGL/eglext_angle.h>
-+#else
- #include <EGL/eglextchromium.h>
-+#endif
- #include <X11/Xutil.h>
- 
- class CGLContextEGL : public CGLContext