Request 5352 (accepted)

Overview

Request 5352 (accepted)

No description set

Created by sagiben almost 4 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,15 +18,18 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
-%define ffmpeg_version 4.0.3-Leia-RC5
+%define kodi_version Matrix
+%define ffmpeg_version 4.3.1-Matrix-Beta1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
 %bcond_without sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_with kodi_with_X11
+# Enable or disable Wayland depending on whether the stack is usable or not:
+%bcond_with kodi_with_wayland
+
 %define kodi_platform raspberry-pi
 %define kodi_player omxplayer
 
@@ -46,7 +49,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        18.9
+Version:        19.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -64,10 +67,10 @@
 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
-%if %{without sysffmpeg}
+## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-%endif
-Patch0:         kodi-sse.patch
+## endif
+#Patch0:         kodi-sse.patch
 #Patch0:         kodi.arm.patch
 #Patch1:         no-xbmc-symbolic-link.patch
 #Patch2:         kodi-texturepacker.patch
@@ -77,9 +80,13 @@
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
+%if %{without kodi_with_wayland}
+Patch9:         kodi-disable-wayland.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -91,6 +98,7 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -98,7 +106,7 @@
 BuildRequires:  fstrcmp-devel
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -113,6 +121,7 @@
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -121,8 +130,9 @@
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -132,17 +142,23 @@
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(gbm)
 %if %{with kodi_with_X11}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(xkbcommon)
 %endif
 BuildRequires:  pkgconfig(libssh)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
+%if 0%{?suse_version} >= 1550
+BuildRequires:  pkgconfig(libplist-2.0)
+%else
 BuildRequires:  pkgconfig(libplist)
+%endif
 BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
@@ -175,7 +191,6 @@
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
@@ -223,6 +238,15 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+%if %{with kodi_with_wayland}
+BuildRequires:  pkgconfig(libva-wayland)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-client++)
+BuildRequires:  pkgconfig(wayland-cursor++)
+BuildRequires:  pkgconfig(wayland-egl++)
+%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -240,9 +264,7 @@
 BuildRequires:  gperf
 BuildRequires:  unzip
 BuildRequires:  zip
-%ifarch %ix86
 BuildRequires:  nasm
-%endif
 %if %{dev_build}
 BuildRequires:  ccache
 %endif
@@ -256,6 +278,15 @@
 BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
+BuildRequires:  libunistring-devel
+
+%if 0%{?suse_version} > 1510
+BuildRequires:  pkgconfig(gtest)
+%else
+BuildRequires: googletest-devel
+%endif
+#
 %{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
@@ -263,6 +294,7 @@
 #
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
@@ -291,7 +323,21 @@
 Development files for Kodi Media Center
 
 %prep
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+#%patch8 -p1
+%if %{without kodi_with_wayland}
+%patch9
+%endif
 
 %build
 
@@ -335,17 +381,29 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DFFMPEG_URL=%{SOURCE30} \
     -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_CDIO=OFF \
+    -DENABLE_INTERNAL_SPDLOG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
     -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
     -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DBUILD_SHARED_LIBS=1 
-    
+    -DAPP_RENDER_SYSTEM=gl \
+    -DX11_RENDER_SYSTEM=gl \
+    -DBUILD_SHARED_LIBS=1 \
+    ${NULL}
+
+    #-DRapidJSON_URL=%{SOURCE25}
+    #-DENABLE_INTERNAL_RapidJSON=ON
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
+    #-DFLATBUFFERS_URL=%{SOURCE26}
+    #-DENABLE_INTERNAL_FSTRCMP=ON
+    #-DFSTRCMP_URL=%{SOURCE27}
+
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
@@ -353,8 +411,11 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
+# Tumbleweed does not have SuSEfirewall anymore:
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 
 # Systemd service file
 %if %{without kodi_with_X11}
@@ -407,15 +468,19 @@
 %service_del_postun kodi.service
 
 %files
+%defattr(-,root,root)
 %doc version.txt 
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/TexturePacker
+%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%{_libdir}/kodi/kodi-x11
+%{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
@@ -457,8 +522,12 @@
 %{_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/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -537,6 +606,12 @@
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
 %{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_kodi_addons_dir}/metadata.generic.albums
+%{_kodi_addons_dir}/metadata.generic.albums/*
+%dir %{_kodi_addons_dir}/metadata.generic.artists
+%{_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
@@ -566,76 +641,63 @@
 
 
 %files devel
+%defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/xbmc_epg_types.h
-%{_includedir}/kodi/xbmc_addon_dll.h
-%{_includedir}/kodi/xbmc_addon_types.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/Filesystem.h
 %{_includedir}/kodi/General.h
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/VideoCodec.h
-%{_includedir}/kodi/addon-instance/Peripheral.h
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
-%{_includedir}/kodi/addon-instance/Visualization.h
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
-%{_includedir}/kodi/addon-instance/VFS.h
-%{_includedir}/kodi/addon-instance/Inputstream.h
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
-%{_includedir}/kodi/addon-instance/Screensaver.h
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
-%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/Network.h
 %{_includedir}/kodi/versions.h
-%{_includedir}/kodi/xbmc_pvr_dll.h
-%{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/StreamCodec.h
+%dir %{_includedir}/kodi/addon-instance
+%{_includedir}/kodi/addon-instance/*
+%dir %{_includedir}/kodi/addon-instance/inputstream
+%{_includedir}/kodi/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/addon-instance/peripheral
+%{_includedir}/kodi/addon-instance/peripheral/*
+%dir %{_includedir}/kodi/addon-instance/pvr
+%{_includedir}/kodi/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api
+%{_includedir}/kodi/c-api/*
+%dir %{_includedir}/kodi/c-api/addon-instance
+%{_includedir}/kodi/c-api/addon-instance/*
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api/gui
+%{_includedir}/kodi/c-api/gui/*
+%dir %{_includedir}/kodi/c-api/gui/controls
+%{_includedir}/kodi/c-api/gui/controls/*
+%dir %{_includedir}/kodi/c-api/gui/dialogs
+%{_includedir}/kodi/c-api/gui/dialogs/*
+%dir %{_includedir}/kodi/c-api/gui/input
+%{_includedir}/kodi/c-api/gui/input/*
+%dir %{_includedir}/kodi/c-api/platform
+%dir %{_includedir}/kodi/c-api/platform/android
+%{_includedir}/kodi/c-api/platform/android/*
 %dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/definitions.h
-%{_includedir}/kodi/gui/Window.h
-%{_includedir}/kodi/gui/General.h
-%{_includedir}/kodi/gui/ListItem.h
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/Select.h
-%{_includedir}/kodi/gui/dialogs/OK.h
-%{_includedir}/kodi/gui/dialogs/YesNo.h
-%{_includedir}/kodi/gui/dialogs/Numeric.h
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
-%{_includedir}/kodi/gui/dialogs/Progress.h
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
+%{_includedir}/kodi/gui/*
 %dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/FadeLabel.h
-%{_includedir}/kodi/gui/controls/Edit.h
-%{_includedir}/kodi/gui/controls/TextBox.h
-%{_includedir}/kodi/gui/controls/Progress.h
-%{_includedir}/kodi/gui/controls/Rendering.h
-%{_includedir}/kodi/gui/controls/Slider.h
-%{_includedir}/kodi/gui/controls/Image.h
-%{_includedir}/kodi/gui/controls/Label.h
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
-%{_includedir}/kodi/gui/controls/RadioButton.h
-%{_includedir}/kodi/gui/controls/Button.h
-%{_includedir}/kodi/gui/controls/Spin.h
-%{_includedir}/kodi/DemuxCrypto.h
-%{_includedir}/kodi/DemuxPacket.h
-%{_includedir}/kodi/TimingConstants.h
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/ActionIDs.h
-%{_includedir}/kodi/XBMC_vkeys.h
+%{_includedir}/kodi/gui/controls/*
+%dir %{_includedir}/kodi/gui/dialogs
+%{_includedir}/kodi/gui/dialogs/*
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/*
+%dir %{_includedir}/kodi/gui/input
+%{_includedir}/kodi/gui/input/*
+%dir %{_includedir}/kodi/platform
+%dir %{_includedir}/kodi/platform/android
+%{_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,15 +18,18 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
-%define ffmpeg_version 4.0.3-Leia-RC5
+%define kodi_version Matrix
+%define ffmpeg_version 4.3.1-Matrix-Beta1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
 %bcond_without sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_with kodi_with_X11
+# Enable or disable Wayland depending on whether the stack is usable or not:
+%bcond_with kodi_with_wayland
+
 %define kodi_platform raspberry-pi2
 %define kodi_player omxplayer
 
@@ -46,7 +49,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        18.9
+Version:        19.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -64,10 +67,10 @@
 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
-%if %{without sysffmpeg}
+## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-%endif
-Patch0:         kodi-sse.patch
+## endif
+#Patch0:         kodi-sse.patch
 #Patch0:         kodi.arm.patch
 #Patch1:         no-xbmc-symbolic-link.patch
 #Patch2:         kodi-texturepacker.patch
@@ -77,9 +80,13 @@
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
+%if %{without kodi_with_wayland}
+Patch9:         kodi-disable-wayland.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -91,6 +98,7 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -98,7 +106,7 @@
 BuildRequires:  fstrcmp-devel
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -113,6 +121,7 @@
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -121,8 +130,9 @@
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -132,17 +142,23 @@
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(gbm)
 %if %{with kodi_with_X11}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(xkbcommon)
 %endif
 BuildRequires:  pkgconfig(libssh)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
+%if 0%{?suse_version} >= 1550
+BuildRequires:  pkgconfig(libplist-2.0)
+%else
 BuildRequires:  pkgconfig(libplist)
+%endif
 BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
@@ -175,7 +191,6 @@
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
@@ -223,6 +238,15 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+%if %{with kodi_with_wayland}
+BuildRequires:  pkgconfig(libva-wayland)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-client++)
+BuildRequires:  pkgconfig(wayland-cursor++)
+BuildRequires:  pkgconfig(wayland-egl++)
+%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -240,9 +264,7 @@
 BuildRequires:  gperf
 BuildRequires:  unzip
 BuildRequires:  zip
-%ifarch %ix86
 BuildRequires:  nasm
-%endif
 %if %{dev_build}
 BuildRequires:  ccache
 %endif
@@ -256,6 +278,15 @@
 BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
+BuildRequires:  libunistring-devel
+
+%if 0%{?suse_version} > 1510
+BuildRequires:  pkgconfig(gtest)
+%else
+BuildRequires: googletest-devel
+%endif
+#
 %{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
@@ -263,6 +294,7 @@
 #
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
@@ -291,7 +323,21 @@
 Development files for Kodi Media Center
 
 %prep
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+#%patch8 -p1
+%if %{without kodi_with_wayland}
+%patch9
+%endif
 
 %build
 
@@ -335,17 +381,29 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DFFMPEG_URL=%{SOURCE30} \
     -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_CDIO=OFF \
+    -DENABLE_INTERNAL_SPDLOG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
     -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
     -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DBUILD_SHARED_LIBS=1 
-    
+    -DAPP_RENDER_SYSTEM=gl \
+    -DX11_RENDER_SYSTEM=gl \
+    -DBUILD_SHARED_LIBS=1 \
+    ${NULL}
+
+    #-DRapidJSON_URL=%{SOURCE25}
+    #-DENABLE_INTERNAL_RapidJSON=ON
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
+    #-DFLATBUFFERS_URL=%{SOURCE26}
+    #-DENABLE_INTERNAL_FSTRCMP=ON
+    #-DFSTRCMP_URL=%{SOURCE27}
+
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
@@ -353,8 +411,11 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
+# Tumbleweed does not have SuSEfirewall anymore:
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 
 # Systemd service file
 %if %{without kodi_with_X11}
@@ -407,15 +468,19 @@
 %service_del_postun kodi.service
 
 %files
+%defattr(-,root,root)
 %doc version.txt 
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/TexturePacker
+%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%{_libdir}/kodi/kodi-x11
+%{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
@@ -457,8 +522,12 @@
 %{_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/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -537,6 +606,12 @@
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
 %{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_kodi_addons_dir}/metadata.generic.albums
+%{_kodi_addons_dir}/metadata.generic.albums/*
+%dir %{_kodi_addons_dir}/metadata.generic.artists
+%{_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
@@ -566,76 +641,63 @@
 
 
 %files devel
+%defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/xbmc_epg_types.h
-%{_includedir}/kodi/xbmc_addon_dll.h
-%{_includedir}/kodi/xbmc_addon_types.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/Filesystem.h
 %{_includedir}/kodi/General.h
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/VideoCodec.h
-%{_includedir}/kodi/addon-instance/Peripheral.h
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
-%{_includedir}/kodi/addon-instance/Visualization.h
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
-%{_includedir}/kodi/addon-instance/VFS.h
-%{_includedir}/kodi/addon-instance/Inputstream.h
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
-%{_includedir}/kodi/addon-instance/Screensaver.h
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
-%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/Network.h
 %{_includedir}/kodi/versions.h
-%{_includedir}/kodi/xbmc_pvr_dll.h
-%{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/StreamCodec.h
+%dir %{_includedir}/kodi/addon-instance
+%{_includedir}/kodi/addon-instance/*
+%dir %{_includedir}/kodi/addon-instance/inputstream
+%{_includedir}/kodi/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/addon-instance/peripheral
+%{_includedir}/kodi/addon-instance/peripheral/*
+%dir %{_includedir}/kodi/addon-instance/pvr
+%{_includedir}/kodi/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api
+%{_includedir}/kodi/c-api/*
+%dir %{_includedir}/kodi/c-api/addon-instance
+%{_includedir}/kodi/c-api/addon-instance/*
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api/gui
+%{_includedir}/kodi/c-api/gui/*
+%dir %{_includedir}/kodi/c-api/gui/controls
+%{_includedir}/kodi/c-api/gui/controls/*
+%dir %{_includedir}/kodi/c-api/gui/dialogs
+%{_includedir}/kodi/c-api/gui/dialogs/*
+%dir %{_includedir}/kodi/c-api/gui/input
+%{_includedir}/kodi/c-api/gui/input/*
+%dir %{_includedir}/kodi/c-api/platform
+%dir %{_includedir}/kodi/c-api/platform/android
+%{_includedir}/kodi/c-api/platform/android/*
 %dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/definitions.h
-%{_includedir}/kodi/gui/Window.h
-%{_includedir}/kodi/gui/General.h
-%{_includedir}/kodi/gui/ListItem.h
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/Select.h
-%{_includedir}/kodi/gui/dialogs/OK.h
-%{_includedir}/kodi/gui/dialogs/YesNo.h
-%{_includedir}/kodi/gui/dialogs/Numeric.h
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
-%{_includedir}/kodi/gui/dialogs/Progress.h
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
+%{_includedir}/kodi/gui/*
 %dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/FadeLabel.h
-%{_includedir}/kodi/gui/controls/Edit.h
-%{_includedir}/kodi/gui/controls/TextBox.h
-%{_includedir}/kodi/gui/controls/Progress.h
-%{_includedir}/kodi/gui/controls/Rendering.h
-%{_includedir}/kodi/gui/controls/Slider.h
-%{_includedir}/kodi/gui/controls/Image.h
-%{_includedir}/kodi/gui/controls/Label.h
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
-%{_includedir}/kodi/gui/controls/RadioButton.h
-%{_includedir}/kodi/gui/controls/Button.h
-%{_includedir}/kodi/gui/controls/Spin.h
-%{_includedir}/kodi/DemuxCrypto.h
-%{_includedir}/kodi/DemuxPacket.h
-%{_includedir}/kodi/TimingConstants.h
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/ActionIDs.h
-%{_includedir}/kodi/XBMC_vkeys.h
+%{_includedir}/kodi/gui/controls/*
+%dir %{_includedir}/kodi/gui/dialogs
+%{_includedir}/kodi/gui/dialogs/*
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/*
+%dir %{_includedir}/kodi/gui/input
+%{_includedir}/kodi/gui/input/*
+%dir %{_includedir}/kodi/platform
+%dir %{_includedir}/kodi/platform/android
+%{_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,15 +18,18 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
-%define ffmpeg_version 4.0.3-Leia-RC5
+%define kodi_version Matrix
+%define ffmpeg_version 4.3.1-Matrix-Beta1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
 %bcond_without sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_with kodi_with_X11
+# Enable or disable Wayland depending on whether the stack is usable or not:
+%bcond_with kodi_with_wayland
+
 %define kodi_platform none
 %define kodi_player none
 
@@ -46,7 +49,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        18.9
+Version:        19.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -64,10 +67,10 @@
 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
-%if %{without sysffmpeg}
+## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-%endif
-Patch0:         kodi-sse.patch
+## endif
+#Patch0:         kodi-sse.patch
 #Patch0:         kodi.arm.patch
 #Patch1:         no-xbmc-symbolic-link.patch
 #Patch2:         kodi-texturepacker.patch
@@ -77,9 +80,13 @@
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
+%if %{without kodi_with_wayland}
+Patch9:         kodi-disable-wayland.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -91,6 +98,7 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -98,7 +106,7 @@
 BuildRequires:  fstrcmp-devel
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -113,6 +121,7 @@
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -121,8 +130,9 @@
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -132,17 +142,23 @@
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(gbm)
 %if %{with kodi_with_X11}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(xkbcommon)
 %endif
 BuildRequires:  pkgconfig(libssh)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
+%if 0%{?suse_version} >= 1550
+BuildRequires:  pkgconfig(libplist-2.0)
+%else
 BuildRequires:  pkgconfig(libplist)
+%endif
 BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
@@ -175,7 +191,6 @@
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
@@ -223,6 +238,15 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+%if %{with kodi_with_wayland}
+BuildRequires:  pkgconfig(libva-wayland)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-client++)
+BuildRequires:  pkgconfig(wayland-cursor++)
+BuildRequires:  pkgconfig(wayland-egl++)
+%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -240,9 +264,7 @@
 BuildRequires:  gperf
 BuildRequires:  unzip
 BuildRequires:  zip
-%ifarch %ix86
 BuildRequires:  nasm
-%endif
 %if %{dev_build}
 BuildRequires:  ccache
 %endif
@@ -256,6 +278,15 @@
 BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
+BuildRequires:  libunistring-devel
+
+%if 0%{?suse_version} > 1510
+BuildRequires:  pkgconfig(gtest)
+%else
+BuildRequires: googletest-devel
+%endif
+#
 %{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
@@ -263,6 +294,7 @@
 #
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
@@ -291,7 +323,21 @@
 Development files for Kodi Media Center
 
 %prep
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+#%patch8 -p1
+%if %{without kodi_with_wayland}
+%patch9
+%endif
 
 %build
 
@@ -335,17 +381,29 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DFFMPEG_URL=%{SOURCE30} \
     -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_CDIO=OFF \
+    -DENABLE_INTERNAL_SPDLOG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
     -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
     -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DBUILD_SHARED_LIBS=1 
-    
+    -DAPP_RENDER_SYSTEM=gl \
+    -DX11_RENDER_SYSTEM=gl \
+    -DBUILD_SHARED_LIBS=1 \
+    ${NULL}
+
+    #-DRapidJSON_URL=%{SOURCE25}
+    #-DENABLE_INTERNAL_RapidJSON=ON
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
+    #-DFLATBUFFERS_URL=%{SOURCE26}
+    #-DENABLE_INTERNAL_FSTRCMP=ON
+    #-DFSTRCMP_URL=%{SOURCE27}
+
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
@@ -353,8 +411,11 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
+# Tumbleweed does not have SuSEfirewall anymore:
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 
 # Systemd service file
 %if %{without kodi_with_X11}
@@ -407,15 +468,19 @@
 %service_del_postun kodi.service
 
 %files
+%defattr(-,root,root)
 %doc version.txt 
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/TexturePacker
+%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%{_libdir}/kodi/kodi-x11
+%{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
@@ -457,8 +522,12 @@
 %{_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/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -537,6 +606,12 @@
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
 %{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_kodi_addons_dir}/metadata.generic.albums
+%{_kodi_addons_dir}/metadata.generic.albums/*
+%dir %{_kodi_addons_dir}/metadata.generic.artists
+%{_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
@@ -566,76 +641,63 @@
 
 
 %files devel
+%defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/xbmc_epg_types.h
-%{_includedir}/kodi/xbmc_addon_dll.h
-%{_includedir}/kodi/xbmc_addon_types.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/Filesystem.h
 %{_includedir}/kodi/General.h
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/VideoCodec.h
-%{_includedir}/kodi/addon-instance/Peripheral.h
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
-%{_includedir}/kodi/addon-instance/Visualization.h
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
-%{_includedir}/kodi/addon-instance/VFS.h
-%{_includedir}/kodi/addon-instance/Inputstream.h
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
-%{_includedir}/kodi/addon-instance/Screensaver.h
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
-%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/Network.h
 %{_includedir}/kodi/versions.h
-%{_includedir}/kodi/xbmc_pvr_dll.h
-%{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/StreamCodec.h
+%dir %{_includedir}/kodi/addon-instance
+%{_includedir}/kodi/addon-instance/*
+%dir %{_includedir}/kodi/addon-instance/inputstream
+%{_includedir}/kodi/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/addon-instance/peripheral
+%{_includedir}/kodi/addon-instance/peripheral/*
+%dir %{_includedir}/kodi/addon-instance/pvr
+%{_includedir}/kodi/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api
+%{_includedir}/kodi/c-api/*
+%dir %{_includedir}/kodi/c-api/addon-instance
+%{_includedir}/kodi/c-api/addon-instance/*
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api/gui
+%{_includedir}/kodi/c-api/gui/*
+%dir %{_includedir}/kodi/c-api/gui/controls
+%{_includedir}/kodi/c-api/gui/controls/*
+%dir %{_includedir}/kodi/c-api/gui/dialogs
+%{_includedir}/kodi/c-api/gui/dialogs/*
+%dir %{_includedir}/kodi/c-api/gui/input
+%{_includedir}/kodi/c-api/gui/input/*
+%dir %{_includedir}/kodi/c-api/platform
+%dir %{_includedir}/kodi/c-api/platform/android
+%{_includedir}/kodi/c-api/platform/android/*
 %dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/definitions.h
-%{_includedir}/kodi/gui/Window.h
-%{_includedir}/kodi/gui/General.h
-%{_includedir}/kodi/gui/ListItem.h
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/Select.h
-%{_includedir}/kodi/gui/dialogs/OK.h
-%{_includedir}/kodi/gui/dialogs/YesNo.h
-%{_includedir}/kodi/gui/dialogs/Numeric.h
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
-%{_includedir}/kodi/gui/dialogs/Progress.h
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
+%{_includedir}/kodi/gui/*
 %dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/FadeLabel.h
-%{_includedir}/kodi/gui/controls/Edit.h
-%{_includedir}/kodi/gui/controls/TextBox.h
-%{_includedir}/kodi/gui/controls/Progress.h
-%{_includedir}/kodi/gui/controls/Rendering.h
-%{_includedir}/kodi/gui/controls/Slider.h
-%{_includedir}/kodi/gui/controls/Image.h
-%{_includedir}/kodi/gui/controls/Label.h
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
-%{_includedir}/kodi/gui/controls/RadioButton.h
-%{_includedir}/kodi/gui/controls/Button.h
-%{_includedir}/kodi/gui/controls/Spin.h
-%{_includedir}/kodi/DemuxCrypto.h
-%{_includedir}/kodi/DemuxPacket.h
-%{_includedir}/kodi/TimingConstants.h
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/ActionIDs.h
-%{_includedir}/kodi/XBMC_vkeys.h
+%{_includedir}/kodi/gui/controls/*
+%dir %{_includedir}/kodi/gui/dialogs
+%{_includedir}/kodi/gui/dialogs/*
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/*
+%dir %{_includedir}/kodi/gui/input
+%{_includedir}/kodi/gui/input/*
+%dir %{_includedir}/kodi/platform
+%dir %{_includedir}/kodi/platform/android
+%{_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,15 +18,18 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Leia
-%define ffmpeg_version 4.0.3-Leia-RC5
+%define kodi_version Matrix
+%define ffmpeg_version 4.3.1-Matrix-Beta1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
 %bcond_without sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %bcond_without kodi_with_X11
+# Enable or disable Wayland depending on whether the stack is usable or not:
+%bcond_with kodi_with_wayland
+
 %define kodi_platform none
 %define kodi_player none
 
@@ -43,10 +46,10 @@
 # 
 %bcond_without systemd
 
-ExclusiveArch: %ix86 x86_64 aarch64
+ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        18.9
+Version:        19.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -64,10 +67,10 @@
 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
-%if %{without sysffmpeg}
+## if %{without sysffmpeg}
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-%endif
-Patch0:         kodi-sse.patch
+## endif
+#Patch0:         kodi-sse.patch
 #Patch0:         kodi.arm.patch
 #Patch1:         no-xbmc-symbolic-link.patch
 #Patch2:         kodi-texturepacker.patch
@@ -77,9 +80,13 @@
 Patch6:         kodi-install.patch
 Patch7:         kodi-apply-dvdrun.patch
 Patch8:	        kodi-libdrm.patch
+%if %{without kodi_with_wayland}
+Patch9:         kodi-disable-wayland.patch
+%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  binutils-gold
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
@@ -91,6 +98,7 @@
 BuildRequires:  gcc8-c++
 %endif
 BuildRequires:  ghostscript
+BuildRequires:  graphviz
 BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -98,7 +106,7 @@
 BuildRequires:  fstrcmp-devel
 BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  pkgconfig(python2)
+BuildRequires:  pkgconfig(python3)
 BuildRequires:  libmysqlclient-devel
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libcurl)
@@ -113,6 +121,7 @@
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libinput)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -121,8 +130,9 @@
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
+BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
@@ -132,17 +142,23 @@
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
+BuildRequires:  pkgconfig(gbm)
 %if %{with kodi_with_X11}
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(xkbcommon)
 %endif
 BuildRequires:  pkgconfig(libssh)
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libnfs)
+%if 0%{?suse_version} >= 1550
+BuildRequires:  pkgconfig(libplist-2.0)
+%else
 BuildRequires:  pkgconfig(libplist)
+%endif
 BuildRequires:  shairplay-devel
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
@@ -175,7 +191,6 @@
 BuildRequires:  pkgconfig(jack)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
 BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
@@ -223,6 +238,15 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+%if %{with kodi_with_wayland}
+BuildRequires:  pkgconfig(libva-wayland)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-client++)
+BuildRequires:  pkgconfig(wayland-cursor++)
+BuildRequires:  pkgconfig(wayland-egl++)
+%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -240,9 +264,7 @@
 BuildRequires:  gperf
 BuildRequires:  unzip
 BuildRequires:  zip
-%ifarch %ix86
 BuildRequires:  nasm
-%endif
 %if %{dev_build}
 BuildRequires:  ccache
 %endif
@@ -256,6 +278,15 @@
 BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+BuildRequires:  pkgconfig(spdlog) > 1.5.0
+BuildRequires:  libunistring-devel
+
+%if 0%{?suse_version} > 1510
+BuildRequires:  pkgconfig(gtest)
+%else
+BuildRequires: googletest-devel
+%endif
+#
 %{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
@@ -263,6 +294,7 @@
 #
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
@@ -291,7 +323,21 @@
 Development files for Kodi Media Center
 
 %prep
-%autosetup -p1 -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version}-%{kodi_version}
+#%setup -q -n xbmc-%{version}
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+#%patch8 -p1
+%if %{without kodi_with_wayland}
+%patch9
+%endif
 
 %build
 
@@ -335,17 +381,29 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DFFMPEG_URL=%{SOURCE30} \
     -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_CDIO=OFF \
+    -DENABLE_INTERNAL_SPDLOG=OFF \
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
     -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_RapidJSON=OFF \
     -DENABLE_INTERNAL_FLATBUFFERS=OFF \
     -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DBUILD_SHARED_LIBS=1 
-    
+    -DAPP_RENDER_SYSTEM=gl \
+    -DX11_RENDER_SYSTEM=gl \
+    -DBUILD_SHARED_LIBS=1 \
+    ${NULL}
+
+    #-DRapidJSON_URL=%{SOURCE25}
+    #-DENABLE_INTERNAL_RapidJSON=ON
+    #-DENABLE_INTERNAL_FLATBUFFERS=ON
+    #-DFLATBUFFERS_URL=%{SOURCE26}
+    #-DENABLE_INTERNAL_FSTRCMP=ON
+    #-DFSTRCMP_URL=%{SOURCE27}
+
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
 
 %install
@@ -353,8 +411,11 @@
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
+# Tumbleweed does not have SuSEfirewall anymore:
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 
 # Systemd service file
 %if %{without kodi_with_X11}
@@ -407,15 +468,19 @@
 %service_del_postun kodi.service
 
 %files
+%defattr(-,root,root)
 %doc version.txt 
-%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d
+%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
+%endif
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/TexturePacker
+%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%{_libdir}/kodi/kodi-x11
+%{_libdir}/kodi/kodi.bin
 %endif
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
@@ -457,8 +522,12 @@
 %{_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/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -537,6 +606,12 @@
 %{_kodi_addons_dir}/kodi.binary.instance.visualization/*
 %dir %{_kodi_addons_dir}/script.module.pycryptodome
 %{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_kodi_addons_dir}/metadata.generic.albums
+%{_kodi_addons_dir}/metadata.generic.albums/*
+%dir %{_kodi_addons_dir}/metadata.generic.artists
+%{_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
@@ -566,76 +641,63 @@
 
 
 %files devel
+%defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/xbmc_epg_types.h
-%{_includedir}/kodi/xbmc_addon_dll.h
-%{_includedir}/kodi/xbmc_addon_types.h
 %dir %{_includedir}/kodi/tools
 %{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_game.h
-%{_includedir}/kodi/kodi_game_dll.h
 %{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/StreamCrypto.h
-%{_includedir}/kodi/kodi_game_types.h
+%{_includedir}/kodi/AudioEngine.h
+%{_includedir}/kodi/Filesystem.h
 %{_includedir}/kodi/General.h
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/VideoCodec.h
-%{_includedir}/kodi/addon-instance/Peripheral.h
-%{_includedir}/kodi/addon-instance/AudioEncoder.h
-%{_includedir}/kodi/addon-instance/Visualization.h
-%{_includedir}/kodi/addon-instance/AudioDecoder.h
-%{_includedir}/kodi/addon-instance/VFS.h
-%{_includedir}/kodi/addon-instance/Inputstream.h
-%{_includedir}/kodi/addon-instance/ImageDecoder.h
-%{_includedir}/kodi/addon-instance/Screensaver.h
-%{_includedir}/kodi/addon-instance/PeripheralUtils.h
-%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/Network.h
 %{_includedir}/kodi/versions.h
-%{_includedir}/kodi/xbmc_pvr_dll.h
-%{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/StreamCodec.h
+%dir %{_includedir}/kodi/addon-instance
+%{_includedir}/kodi/addon-instance/*
+%dir %{_includedir}/kodi/addon-instance/inputstream
+%{_includedir}/kodi/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/addon-instance/peripheral
+%{_includedir}/kodi/addon-instance/peripheral/*
+%dir %{_includedir}/kodi/addon-instance/pvr
+%{_includedir}/kodi/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api
+%{_includedir}/kodi/c-api/*
+%dir %{_includedir}/kodi/c-api/addon-instance
+%{_includedir}/kodi/c-api/addon-instance/*
+%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
+%{_includedir}/kodi/c-api/addon-instance/inputstream/*
+%dir %{_includedir}/kodi/c-api/addon-instance/pvr
+%{_includedir}/kodi/c-api/addon-instance/pvr/*
+%dir %{_includedir}/kodi/c-api/gui
+%{_includedir}/kodi/c-api/gui/*
+%dir %{_includedir}/kodi/c-api/gui/controls
+%{_includedir}/kodi/c-api/gui/controls/*
+%dir %{_includedir}/kodi/c-api/gui/dialogs
+%{_includedir}/kodi/c-api/gui/dialogs/*
+%dir %{_includedir}/kodi/c-api/gui/input
+%{_includedir}/kodi/c-api/gui/input/*
+%dir %{_includedir}/kodi/c-api/platform
+%dir %{_includedir}/kodi/c-api/platform/android
+%{_includedir}/kodi/c-api/platform/android/*
 %dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/definitions.h
-%{_includedir}/kodi/gui/Window.h
-%{_includedir}/kodi/gui/General.h
-%{_includedir}/kodi/gui/ListItem.h
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/Select.h
-%{_includedir}/kodi/gui/dialogs/OK.h
-%{_includedir}/kodi/gui/dialogs/YesNo.h
-%{_includedir}/kodi/gui/dialogs/Numeric.h
-%{_includedir}/kodi/gui/dialogs/ExtendedProgress.h
-%{_includedir}/kodi/gui/dialogs/FileBrowser.h
-%{_includedir}/kodi/gui/dialogs/ContextMenu.h
-%{_includedir}/kodi/gui/dialogs/Keyboard.h
-%{_includedir}/kodi/gui/dialogs/Progress.h
-%{_includedir}/kodi/gui/dialogs/TextViewer.h
+%{_includedir}/kodi/gui/*
 %dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/FadeLabel.h
-%{_includedir}/kodi/gui/controls/Edit.h
-%{_includedir}/kodi/gui/controls/TextBox.h
-%{_includedir}/kodi/gui/controls/Progress.h
-%{_includedir}/kodi/gui/controls/Rendering.h
-%{_includedir}/kodi/gui/controls/Slider.h
-%{_includedir}/kodi/gui/controls/Image.h
-%{_includedir}/kodi/gui/controls/Label.h
-%{_includedir}/kodi/gui/controls/SettingsSlider.h
-%{_includedir}/kodi/gui/controls/RadioButton.h
-%{_includedir}/kodi/gui/controls/Button.h
-%{_includedir}/kodi/gui/controls/Spin.h
-%{_includedir}/kodi/DemuxCrypto.h
-%{_includedir}/kodi/DemuxPacket.h
-%{_includedir}/kodi/TimingConstants.h
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/ActionIDs.h
-%{_includedir}/kodi/XBMC_vkeys.h
+%{_includedir}/kodi/gui/controls/*
+%dir %{_includedir}/kodi/gui/dialogs
+%{_includedir}/kodi/gui/dialogs/*
+%dir %{_includedir}/kodi/gui/gl
+%{_includedir}/kodi/gui/gl/*
+%dir %{_includedir}/kodi/gui/input
+%{_includedir}/kodi/gui/input/*
+%dir %{_includedir}/kodi/platform
+%dir %{_includedir}/kodi/platform/android
+%{_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-apply-dvdrun.patch Changed

@@ -1,10 +1,10 @@
---- a/cmake/modules/FindLibDvd.cmake
-+++ b/cmake/modules/FindLibDvd.cmake
-@@ -201,6 +201,7 @@ else()
+--- cmake/modules/FindLibDvd.cmake.orig	2021-02-18 23:17:59.000000000 +0100
++++ cmake/modules/FindLibDvd.cmake	2021-03-07 16:17:14.557083228 +0100
+@@ -215,6 +215,7 @@ else()
                                                    "DVDREAD_CFLAGS=${DVDREAD_CFLAGS}"
                                                    "DVDREAD_LIBS=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/libdvd/lib/libdvdread.la"
                                                    "LIBS=${DVDNAV_LIBS}"
-+				PATCH_COMMAND patch -p0 -i /home/abuild/rpmbuild/SOURCES/libdvdnav-no-return.patch
++                                PATCH_COMMAND patch -p0 -i /home/abuild/rpmbuild/SOURCES/libdvdnav-no-return.patch
+                                 BUILD_COMMAND ${MAKE_COMMAND}
                                  BUILD_BYPRODUCTS ${DVDNAV_LIBRARY})
      ExternalProject_Add_Step(dvdnav autoreconf
-                                     DEPENDEES download update patch

kodi-disable-wayland.patch Added

kodi-install.patch Changed

kodi-libdrm.patch Changed

_constraints Changed

kodi.VERSION Changed

Build Results
RPM Lint

Refresh

Comments for request 5352 0

Request History

sagiben created request almost 4 years ago

sagiben accepted request almost 4 years ago