Request 4472 (accepted)

Overview

Request 4472 (accepted)

- Version update to Kodi 18.1 Leia
- Add BuildRequires: pkgconfig(lirc)
- Version update to Kodi 18.0 Leia:
http://kodi.wiki/view/Kodi_v18_(Leia)_changelog
- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
- Version update to Kodi 18.1 Leia
- Add BuildRequires: pkgconfig(lirc)
- Version update to Kodi 18.0 Leia:
http://kodi.wiki/view/Kodi_v18_(Leia)_changelog
- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
- Version update to Kodi 18.1 Leia
- Add BuildRequires: pkgconfig(lirc)
- Version update to Kodi 18.0 Leia:
http://kodi.wiki/view/Kodi_v18_(Leia)_changelog
- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
- Version update to Kodi 18.1 Leia
- Add BuildRequires: pkgconfig(lirc)
- Version update to Kodi 18.0 Leia:
http://kodi.wiki/view/Kodi_v18_(Leia)_changelog
- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.

Created by sagiben over 5 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,13 +18,13 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
-%define ffmpeg_version 3.1.11-Krypton-17.5
+%define kodi_version Leia
+%define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%define dev_build 1
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
-%bcond_with sysffmpeg
+%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
 %define kodi_platform raspberry-pi
@@ -40,11 +40,13 @@
 %endif
 #
 %bcond_without kodi_libbluray
+# 
+%bcond_without systemd
 
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        17.6
+Version:        18.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -56,28 +58,39 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
+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
+Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
+Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
-# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
-Patch0:         kodi.arm.patch
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         kodi.aarch64.patch
-Patch5:         kodi-tools-libdir.patch
+#Patch0:         kodi.arm.patch
+##Patch1:         no-xbmc-symbolic-link.patch
+##Patch2:         kodi-texturepacker.patch
+##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
+Patch9:		kodi.sqlite.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+BuildRequires:  ghostscript
+BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python2)
@@ -93,24 +106,24 @@
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(yajl) >= 2
-%if 0%{?suse_version} > 1320
+BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
-%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(sqlite3) 
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(lirc)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
@@ -130,15 +143,15 @@
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(libcap)
+BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
-BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
-BuildRequires:  pkgconfig(libavformat) >= 56.25.101
-BuildRequires:  pkgconfig(libavutil) >= 54.20.100
-BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
-BuildRequires:  pkgconfig(libswscale) >= 3.1.101
-BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  pkgconfig(libavcodec) >= 58.18.100
+BuildRequires:  pkgconfig(libavfilter) >= 6.107.100
+BuildRequires:  pkgconfig(libavformat) >= 58.12.100
+BuildRequires:  pkgconfig(libavutil) >= 56.14.100
+BuildRequires:  pkgconfig(libpostproc) >= 54.7.100
+BuildRequires:  pkgconfig(libswscale) >= 4.8.100
+BuildRequires:  pkgconfig(libswresample) >= 3.1.100
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -162,7 +175,6 @@
 BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
@@ -170,7 +182,6 @@
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.3.0
 BuildRequires:  pkgconfig(x11)
@@ -197,8 +208,13 @@
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+%if 0%{?suse_version} < 1500
 BuildRequires:  pkgconfig(libva) >= 0.38
 BuildRequires:  pkgconfig(libva-x11) >= 0.38
+%else
+BuildRequires:  pkgconfig(libva) >= 1.0.0
+BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+%endif
 %endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
@@ -230,9 +246,10 @@
 # TexturePacker
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
-BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+%{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
@@ -240,7 +257,7 @@
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -258,7 +275,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -269,21 +286,20 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+%patch8 -p1
+%patch9
 
 # Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
@@ -294,110 +310,45 @@
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/linux/*.cpp
-
-cp %{SOURCE20} tools/depends/target/crossguid
-cp %{SOURCE21} tools/depends/target/libdvdnav
-cp %{SOURCE22} tools/depends/target/libdvdcss
-cp %{SOURCE23} tools/depends/target/libdvdread
-%if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
-%endif
+    xbmc/platform/linux/*.cpp
 
 %build
-export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # Fix for missing 'l' alias
 alias l='ls -alF'
-# build crossguid
-make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-
-chmod +x bootstrap
-./bootstrap
-
-# add crossguid to INCLUDES and LIBS
-export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
-export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-%configure \
-%if %{with sysffmpeg}
-    --with-ffmpeg=shared \
-%endif
-    --disable-shared-lib \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
-    --disable-openmax \
-    --disable-tegra \
-    --disable-profiling \
-    --enable-x11 \
-    --disable-ccache \
-    --enable-alsa \
-    --enable-dbus \
-    --enable-pulse \
-    --enable-ssh \
-    --enable-samba \
-    --enable-nfs \
-    --enable-airplay \
-    --disable-airtunes \
-    --enable-upnp \
-    --enable-mid \
-    --enable-avahi \
-    --disable-mdnsembedded \
-    --disable-non-free \
-    --enable-mysql \
-    --enable-webserver \
-    --enable-optical-drive \
-    --disable-libbluray \
-    --enable-libxslt \
-    --enable-texturepacker \
-    --enable-udev \
-    --disable-libusb \
-    --enable-libcec \
-    --enable-lcms2 \
-    --enable-libbluetooth \
-    --enable-libcap \
-    --disable-gtest \
-    --disable-codec \
-    --disable-libav-compat \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%endif
-    --with-platform=%{kodi_platform} \
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%if %{without kodi_with_X11}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
+
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
 %if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
+    -DVERBOSE=ON \
 %endif
-    --disable-static
-
-make -O %{?_smp_mflags} V=1|| l
-#%%{?_smp_mflags}
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DENABLE_INTERNAL_RapidJSON=ON \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DFLATBUFFERS_URL=%{SOURCE26} \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DFSTRCMP_URL=%{SOURCE27} \
+    -DBUILD_SHARED_LIBS=1 
+    
+make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7 || l
 
 %install
+pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
@@ -414,10 +365,6 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
-# copy manpages
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -435,6 +382,11 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
+# copy manpages
+popd
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
@@ -455,22 +407,16 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
+%{_libdir}/kodi/kodi-x11
 %endif
-%{_bindir}/kodi-standalone
-%dir %{_libdir}/kodi/addons
-%dir %{_libdir}/kodi/addons/library.xbmc.addon/
-%{_libdir}/kodi/addons/library.xbmc.addon/*
-%dir %{_libdir}/kodi/addons/library.xbmc.codec/
-%{_libdir}/kodi/addons/library.xbmc.codec/*
-%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
-%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/*
@@ -489,8 +435,8 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/kodi.game
-%{_kodi_addons_dir}/kodi.game/*
+%dir %{_kodi_addons_dir}/game.controller.snes
+%{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -505,12 +451,14 @@
 %{_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.tvdb.com/
-%{_kodi_addons_dir}/metadata.tvdb.com/*
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -525,8 +473,6 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
-%dir %{_kodi_addons_dir}/xbmc.codec/
-%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -537,50 +483,65 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
-%dir %{_kodi_addons_dir}/xbmc.pvr/
-%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
-%dir %{_kodi_addons_dir}/kodi.audiodecoder/
-%{_kodi_addons_dir}/kodi.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.guilib/
-%{_kodi_addons_dir}/kodi.guilib/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
-%dir %{_kodi_addons_dir}/xbmc.audioencoder/
-%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
-%dir %{_kodi_addons_dir}/kodi.adsp
-%{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.inputstream
-%{_kodi_addons_dir}/kodi.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.peripheral
-%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
+%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
+%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
 %dir %{_kodi_addons_dir}/skin.estouchy
 %{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
-%dir %{_libdir}/kodi/addons/library.kodi.inputstream
-%{_libdir}/kodi/addons/library.kodi.inputstream/*
-%dir %{_libdir}/kodi/addons/library.kodi.peripheral
-%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
+%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
+%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.general
+%{_kodi_addons_dir}/kodi.binary.global.general/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.gui
+%{_kodi_addons_dir}/kodi.binary.global.gui/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.main
+%{_kodi_addons_dir}/kodi.binary.global.main/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.network
+%{_kodi_addons_dir}/kodi.binary.global.network/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
+%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.game
+%{_kodi_addons_dir}/kodi.binary.instance.game/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
+%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
+%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
+%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
+%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
+%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
+%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
+%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
+%dir %{_kodi_addons_dir}/script.module.pycryptodome
+%{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_libdir}/firewalld
+%dir %{_libdir}/firewalld/services
+%{_libdir}/firewalld/services/kodi-eventserver.xml
+%{_libdir}/firewalld/services/kodi-http.xml
+%{_libdir}/firewalld/services/kodi-jsonrpc.xml
 
 %if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
@@ -588,63 +549,94 @@
 %{_unitdir}/kodi.service
 %endif
 
-%{_libdir}/kodi/AddOptions.cmake
-%{_libdir}/kodi/AddonHelpers.cmake
-%{_libdir}/kodi/ArchSetup.cmake
-%{_libdir}/kodi/CheckCommits.cmake
-%{_libdir}/kodi/CheckTargetPlatform.cmake
-%{_libdir}/kodi/GenerateVersionedFiles.cmake
-%{_libdir}/kodi/GeneratorSetup.cmake
-%{_libdir}/kodi/HandleDepends.cmake
-%{_libdir}/kodi/KodiConfig.cmake
-%{_libdir}/kodi/Macros.cmake
-%{_libdir}/kodi/PrepareEnv.cmake
-%{_libdir}/kodi/ProjectMacros.cmake
-%{_libdir}/kodi/CMakeHelpers.cmake
-%{_libdir}/kodi/Uninstall.cmake
-
+%dir %{_datadir}/kodi/cmake
+%{_datadir}/kodi/cmake/KodiConfig.cmake
+%{_datadir}/kodi/cmake/AddonHelpers.cmake
+%{_datadir}/kodi/cmake/AddOptions.cmake
+%{_datadir}/kodi/cmake/ArchSetup.cmake
+%{_datadir}/kodi/cmake/CheckCommits.cmake
+%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
+%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GeneratorSetup.cmake
+%{_datadir}/kodi/cmake/HandleDepends.cmake
+%{_datadir}/kodi/cmake/Macros.cmake
+%{_datadir}/kodi/cmake/PrepareEnv.cmake
+%{_datadir}/kodi/cmake/ProjectMacros.cmake
+%{_datadir}/kodi/cmake/PathSetup.cmake
 
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/DVDDemuxPacket.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/libXBMC_addon.h
-%{_includedir}/kodi/libXBMC_codec.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_inputstream.h
-%{_includedir}/kodi/libKODI_peripheral.h
-%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_epg_types.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
-%{_includedir}/kodi/xbmc_codec_types.h
-%{_includedir}/kodi/xbmc_epg_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/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/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/xbmc_scr_dll.h
-%{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_vis_dll.h
-%{_includedir}/kodi/xbmc_vis_types.h
-%{_includedir}/kodi/xbmc_audioenc_dll.h
-%{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/kodi_audiodec_dll.h
-%{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/kodi_adsp_dll.h
-%{_includedir}/kodi/kodi_adsp_types.h
-%{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/kodi_inputstream_dll.h
-%{_includedir}/kodi/kodi_inputstream_types.h
-%{_includedir}/kodi/kodi_peripheral_callbacks.h
-%{_includedir}/kodi/kodi_peripheral_dll.h
-%{_includedir}/kodi/kodi_peripheral_types.h
-%{_includedir}/kodi/kodi_peripheral_utils.hpp
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/kodi_vfs_utils.hpp
-
-
+%{_includedir}/kodi/StreamCodec.h
+%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
+%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
 %changelog

kodi-noX-raspberry-pi2.spec Changed

@@ -18,13 +18,13 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
-%define ffmpeg_version 3.1.11-Krypton-17.5
+%define kodi_version Leia
+%define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%define dev_build 1
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
-%bcond_with sysffmpeg
+%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
 %define kodi_platform raspberry-pi2
@@ -40,11 +40,13 @@
 %endif
 #
 %bcond_without kodi_libbluray
+# 
+%bcond_without systemd
 
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        17.6
+Version:        18.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -56,28 +58,39 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
+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
+Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
+Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
-# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
-Patch0:         kodi.arm.patch
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         kodi.aarch64.patch
-Patch5:         kodi-tools-libdir.patch
+#Patch0:         kodi.arm.patch
+##Patch1:         no-xbmc-symbolic-link.patch
+##Patch2:         kodi-texturepacker.patch
+##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
+Patch9:		kodi.sqlite.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+BuildRequires:  ghostscript
+BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python2)
@@ -93,24 +106,24 @@
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(yajl) >= 2
-%if 0%{?suse_version} > 1320
+BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
-%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(sqlite3) 
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(lirc)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
@@ -130,15 +143,15 @@
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(libcap)
+BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
-BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
-BuildRequires:  pkgconfig(libavformat) >= 56.25.101
-BuildRequires:  pkgconfig(libavutil) >= 54.20.100
-BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
-BuildRequires:  pkgconfig(libswscale) >= 3.1.101
-BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  pkgconfig(libavcodec) >= 58.18.100
+BuildRequires:  pkgconfig(libavfilter) >= 6.107.100
+BuildRequires:  pkgconfig(libavformat) >= 58.12.100
+BuildRequires:  pkgconfig(libavutil) >= 56.14.100
+BuildRequires:  pkgconfig(libpostproc) >= 54.7.100
+BuildRequires:  pkgconfig(libswscale) >= 4.8.100
+BuildRequires:  pkgconfig(libswresample) >= 3.1.100
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -162,7 +175,6 @@
 BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
@@ -170,7 +182,6 @@
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.3.0
 BuildRequires:  pkgconfig(x11)
@@ -197,8 +208,13 @@
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+%if 0%{?suse_version} < 1500
 BuildRequires:  pkgconfig(libva) >= 0.38
 BuildRequires:  pkgconfig(libva-x11) >= 0.38
+%else
+BuildRequires:  pkgconfig(libva) >= 1.0.0
+BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+%endif
 %endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
@@ -230,9 +246,10 @@
 # TexturePacker
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
-BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+%{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
@@ -240,7 +257,7 @@
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -258,7 +275,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -269,21 +286,20 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+%patch8 -p1
+%patch9
 
 # Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
@@ -294,110 +310,45 @@
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/linux/*.cpp
-
-cp %{SOURCE20} tools/depends/target/crossguid
-cp %{SOURCE21} tools/depends/target/libdvdnav
-cp %{SOURCE22} tools/depends/target/libdvdcss
-cp %{SOURCE23} tools/depends/target/libdvdread
-%if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
-%endif
+    xbmc/platform/linux/*.cpp
 
 %build
-export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # Fix for missing 'l' alias
 alias l='ls -alF'
-# build crossguid
-make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-
-chmod +x bootstrap
-./bootstrap
-
-# add crossguid to INCLUDES and LIBS
-export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
-export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-%configure \
-%if %{with sysffmpeg}
-    --with-ffmpeg=shared \
-%endif
-    --disable-shared-lib \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
-    --disable-openmax \
-    --disable-tegra \
-    --disable-profiling \
-    --enable-x11 \
-    --disable-ccache \
-    --enable-alsa \
-    --enable-dbus \
-    --enable-pulse \
-    --enable-ssh \
-    --enable-samba \
-    --enable-nfs \
-    --enable-airplay \
-    --disable-airtunes \
-    --enable-upnp \
-    --enable-mid \
-    --enable-avahi \
-    --disable-mdnsembedded \
-    --disable-non-free \
-    --enable-mysql \
-    --enable-webserver \
-    --enable-optical-drive \
-    --disable-libbluray \
-    --enable-libxslt \
-    --enable-texturepacker \
-    --enable-udev \
-    --disable-libusb \
-    --enable-libcec \
-    --enable-lcms2 \
-    --enable-libbluetooth \
-    --enable-libcap \
-    --disable-gtest \
-    --disable-codec \
-    --disable-libav-compat \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%endif
-    --with-platform=%{kodi_platform} \
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%if %{without kodi_with_X11}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
+
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
 %if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
+    -DVERBOSE=ON \
 %endif
-    --disable-static
-
-make -O %{?_smp_mflags} V=1|| l
-#%%{?_smp_mflags}
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DENABLE_INTERNAL_RapidJSON=ON \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DFLATBUFFERS_URL=%{SOURCE26} \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DFSTRCMP_URL=%{SOURCE27} \
+    -DBUILD_SHARED_LIBS=1 
+    
+make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7 || l
 
 %install
+pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
@@ -414,10 +365,6 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
-# copy manpages
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -435,6 +382,11 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
+# copy manpages
+popd
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
@@ -455,22 +407,16 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
+%{_libdir}/kodi/kodi-x11
 %endif
-%{_bindir}/kodi-standalone
-%dir %{_libdir}/kodi/addons
-%dir %{_libdir}/kodi/addons/library.xbmc.addon/
-%{_libdir}/kodi/addons/library.xbmc.addon/*
-%dir %{_libdir}/kodi/addons/library.xbmc.codec/
-%{_libdir}/kodi/addons/library.xbmc.codec/*
-%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
-%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/*
@@ -489,8 +435,8 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/kodi.game
-%{_kodi_addons_dir}/kodi.game/*
+%dir %{_kodi_addons_dir}/game.controller.snes
+%{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -505,12 +451,14 @@
 %{_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.tvdb.com/
-%{_kodi_addons_dir}/metadata.tvdb.com/*
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -525,8 +473,6 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
-%dir %{_kodi_addons_dir}/xbmc.codec/
-%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -537,50 +483,65 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
-%dir %{_kodi_addons_dir}/xbmc.pvr/
-%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
-%dir %{_kodi_addons_dir}/kodi.audiodecoder/
-%{_kodi_addons_dir}/kodi.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.guilib/
-%{_kodi_addons_dir}/kodi.guilib/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
-%dir %{_kodi_addons_dir}/xbmc.audioencoder/
-%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
-%dir %{_kodi_addons_dir}/kodi.adsp
-%{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.inputstream
-%{_kodi_addons_dir}/kodi.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.peripheral
-%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
+%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
+%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
 %dir %{_kodi_addons_dir}/skin.estouchy
 %{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
-%dir %{_libdir}/kodi/addons/library.kodi.inputstream
-%{_libdir}/kodi/addons/library.kodi.inputstream/*
-%dir %{_libdir}/kodi/addons/library.kodi.peripheral
-%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
+%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
+%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.general
+%{_kodi_addons_dir}/kodi.binary.global.general/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.gui
+%{_kodi_addons_dir}/kodi.binary.global.gui/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.main
+%{_kodi_addons_dir}/kodi.binary.global.main/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.network
+%{_kodi_addons_dir}/kodi.binary.global.network/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
+%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.game
+%{_kodi_addons_dir}/kodi.binary.instance.game/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
+%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
+%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
+%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
+%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
+%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
+%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
+%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
+%dir %{_kodi_addons_dir}/script.module.pycryptodome
+%{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_libdir}/firewalld
+%dir %{_libdir}/firewalld/services
+%{_libdir}/firewalld/services/kodi-eventserver.xml
+%{_libdir}/firewalld/services/kodi-http.xml
+%{_libdir}/firewalld/services/kodi-jsonrpc.xml
 
 %if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
@@ -588,63 +549,94 @@
 %{_unitdir}/kodi.service
 %endif
 
-%{_libdir}/kodi/AddOptions.cmake
-%{_libdir}/kodi/AddonHelpers.cmake
-%{_libdir}/kodi/ArchSetup.cmake
-%{_libdir}/kodi/CheckCommits.cmake
-%{_libdir}/kodi/CheckTargetPlatform.cmake
-%{_libdir}/kodi/GenerateVersionedFiles.cmake
-%{_libdir}/kodi/GeneratorSetup.cmake
-%{_libdir}/kodi/HandleDepends.cmake
-%{_libdir}/kodi/KodiConfig.cmake
-%{_libdir}/kodi/Macros.cmake
-%{_libdir}/kodi/PrepareEnv.cmake
-%{_libdir}/kodi/ProjectMacros.cmake
-%{_libdir}/kodi/CMakeHelpers.cmake
-%{_libdir}/kodi/Uninstall.cmake
-
+%dir %{_datadir}/kodi/cmake
+%{_datadir}/kodi/cmake/KodiConfig.cmake
+%{_datadir}/kodi/cmake/AddonHelpers.cmake
+%{_datadir}/kodi/cmake/AddOptions.cmake
+%{_datadir}/kodi/cmake/ArchSetup.cmake
+%{_datadir}/kodi/cmake/CheckCommits.cmake
+%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
+%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GeneratorSetup.cmake
+%{_datadir}/kodi/cmake/HandleDepends.cmake
+%{_datadir}/kodi/cmake/Macros.cmake
+%{_datadir}/kodi/cmake/PrepareEnv.cmake
+%{_datadir}/kodi/cmake/ProjectMacros.cmake
+%{_datadir}/kodi/cmake/PathSetup.cmake
 
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/DVDDemuxPacket.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/libXBMC_addon.h
-%{_includedir}/kodi/libXBMC_codec.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_inputstream.h
-%{_includedir}/kodi/libKODI_peripheral.h
-%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_epg_types.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
-%{_includedir}/kodi/xbmc_codec_types.h
-%{_includedir}/kodi/xbmc_epg_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/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/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/xbmc_scr_dll.h
-%{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_vis_dll.h
-%{_includedir}/kodi/xbmc_vis_types.h
-%{_includedir}/kodi/xbmc_audioenc_dll.h
-%{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/kodi_audiodec_dll.h
-%{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/kodi_adsp_dll.h
-%{_includedir}/kodi/kodi_adsp_types.h
-%{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/kodi_inputstream_dll.h
-%{_includedir}/kodi/kodi_inputstream_types.h
-%{_includedir}/kodi/kodi_peripheral_callbacks.h
-%{_includedir}/kodi/kodi_peripheral_dll.h
-%{_includedir}/kodi/kodi_peripheral_types.h
-%{_includedir}/kodi/kodi_peripheral_utils.hpp
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/kodi_vfs_utils.hpp
-
-
+%{_includedir}/kodi/StreamCodec.h
+%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
+%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
 %changelog

kodi-noX.spec Changed

@@ -18,13 +18,13 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
-%define ffmpeg_version 3.1.11-Krypton-17.5
+%define kodi_version Leia
+%define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%define dev_build 1
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
-%bcond_with sysffmpeg
+%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
 %define kodi_platform none
@@ -40,11 +40,13 @@
 %endif
 #
 %bcond_without kodi_libbluray
+# 
+%bcond_without systemd
 
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        17.6
+Version:        18.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -56,28 +58,39 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
+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
+Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
+Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
-# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
-Patch0:         kodi.arm.patch
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         kodi.aarch64.patch
-Patch5:         kodi-tools-libdir.patch
+#Patch0:         kodi.arm.patch
+##Patch1:         no-xbmc-symbolic-link.patch
+##Patch2:         kodi-texturepacker.patch
+##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
+Patch9:		kodi.sqlite.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+BuildRequires:  ghostscript
+BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python2)
@@ -93,24 +106,24 @@
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(yajl) >= 2
-%if 0%{?suse_version} > 1320
+BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
-%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(sqlite3) 
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(lirc)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
@@ -130,15 +143,15 @@
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(libcap)
+BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
-BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
-BuildRequires:  pkgconfig(libavformat) >= 56.25.101
-BuildRequires:  pkgconfig(libavutil) >= 54.20.100
-BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
-BuildRequires:  pkgconfig(libswscale) >= 3.1.101
-BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  pkgconfig(libavcodec) >= 58.18.100
+BuildRequires:  pkgconfig(libavfilter) >= 6.107.100
+BuildRequires:  pkgconfig(libavformat) >= 58.12.100
+BuildRequires:  pkgconfig(libavutil) >= 56.14.100
+BuildRequires:  pkgconfig(libpostproc) >= 54.7.100
+BuildRequires:  pkgconfig(libswscale) >= 4.8.100
+BuildRequires:  pkgconfig(libswresample) >= 3.1.100
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -162,7 +175,6 @@
 BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
@@ -170,7 +182,6 @@
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.3.0
 BuildRequires:  pkgconfig(x11)
@@ -197,8 +208,13 @@
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+%if 0%{?suse_version} < 1500
 BuildRequires:  pkgconfig(libva) >= 0.38
 BuildRequires:  pkgconfig(libva-x11) >= 0.38
+%else
+BuildRequires:  pkgconfig(libva) >= 1.0.0
+BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+%endif
 %endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
@@ -230,9 +246,10 @@
 # TexturePacker
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
-BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+%{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
@@ -240,7 +257,7 @@
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -258,7 +275,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -269,21 +286,20 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+%patch8 -p1
+%patch9
 
 # Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
@@ -294,110 +310,45 @@
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/linux/*.cpp
-
-cp %{SOURCE20} tools/depends/target/crossguid
-cp %{SOURCE21} tools/depends/target/libdvdnav
-cp %{SOURCE22} tools/depends/target/libdvdcss
-cp %{SOURCE23} tools/depends/target/libdvdread
-%if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
-%endif
+    xbmc/platform/linux/*.cpp
 
 %build
-export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # Fix for missing 'l' alias
 alias l='ls -alF'
-# build crossguid
-make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-
-chmod +x bootstrap
-./bootstrap
-
-# add crossguid to INCLUDES and LIBS
-export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
-export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-%configure \
-%if %{with sysffmpeg}
-    --with-ffmpeg=shared \
-%endif
-    --disable-shared-lib \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
-    --disable-openmax \
-    --disable-tegra \
-    --disable-profiling \
-    --enable-x11 \
-    --disable-ccache \
-    --enable-alsa \
-    --enable-dbus \
-    --enable-pulse \
-    --enable-ssh \
-    --enable-samba \
-    --enable-nfs \
-    --enable-airplay \
-    --disable-airtunes \
-    --enable-upnp \
-    --enable-mid \
-    --enable-avahi \
-    --disable-mdnsembedded \
-    --disable-non-free \
-    --enable-mysql \
-    --enable-webserver \
-    --enable-optical-drive \
-    --disable-libbluray \
-    --enable-libxslt \
-    --enable-texturepacker \
-    --enable-udev \
-    --disable-libusb \
-    --enable-libcec \
-    --enable-lcms2 \
-    --enable-libbluetooth \
-    --enable-libcap \
-    --disable-gtest \
-    --disable-codec \
-    --disable-libav-compat \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%endif
-    --with-platform=%{kodi_platform} \
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%if %{without kodi_with_X11}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
+
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
 %if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
+    -DVERBOSE=ON \
 %endif
-    --disable-static
-
-make -O %{?_smp_mflags} V=1|| l
-#%%{?_smp_mflags}
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DENABLE_INTERNAL_RapidJSON=ON \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DFLATBUFFERS_URL=%{SOURCE26} \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DFSTRCMP_URL=%{SOURCE27} \
+    -DBUILD_SHARED_LIBS=1 
+    
+make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7 || l
 
 %install
+pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
@@ -414,10 +365,6 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
-# copy manpages
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -435,6 +382,11 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
+# copy manpages
+popd
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
@@ -455,22 +407,16 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
+%{_libdir}/kodi/kodi-x11
 %endif
-%{_bindir}/kodi-standalone
-%dir %{_libdir}/kodi/addons
-%dir %{_libdir}/kodi/addons/library.xbmc.addon/
-%{_libdir}/kodi/addons/library.xbmc.addon/*
-%dir %{_libdir}/kodi/addons/library.xbmc.codec/
-%{_libdir}/kodi/addons/library.xbmc.codec/*
-%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
-%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/*
@@ -489,8 +435,8 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/kodi.game
-%{_kodi_addons_dir}/kodi.game/*
+%dir %{_kodi_addons_dir}/game.controller.snes
+%{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -505,12 +451,14 @@
 %{_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.tvdb.com/
-%{_kodi_addons_dir}/metadata.tvdb.com/*
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -525,8 +473,6 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
-%dir %{_kodi_addons_dir}/xbmc.codec/
-%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -537,50 +483,65 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
-%dir %{_kodi_addons_dir}/xbmc.pvr/
-%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
-%dir %{_kodi_addons_dir}/kodi.audiodecoder/
-%{_kodi_addons_dir}/kodi.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.guilib/
-%{_kodi_addons_dir}/kodi.guilib/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
-%dir %{_kodi_addons_dir}/xbmc.audioencoder/
-%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
-%dir %{_kodi_addons_dir}/kodi.adsp
-%{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.inputstream
-%{_kodi_addons_dir}/kodi.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.peripheral
-%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
+%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
+%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
 %dir %{_kodi_addons_dir}/skin.estouchy
 %{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
-%dir %{_libdir}/kodi/addons/library.kodi.inputstream
-%{_libdir}/kodi/addons/library.kodi.inputstream/*
-%dir %{_libdir}/kodi/addons/library.kodi.peripheral
-%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
+%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
+%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.general
+%{_kodi_addons_dir}/kodi.binary.global.general/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.gui
+%{_kodi_addons_dir}/kodi.binary.global.gui/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.main
+%{_kodi_addons_dir}/kodi.binary.global.main/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.network
+%{_kodi_addons_dir}/kodi.binary.global.network/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
+%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.game
+%{_kodi_addons_dir}/kodi.binary.instance.game/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
+%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
+%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
+%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
+%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
+%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
+%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
+%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
+%dir %{_kodi_addons_dir}/script.module.pycryptodome
+%{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_libdir}/firewalld
+%dir %{_libdir}/firewalld/services
+%{_libdir}/firewalld/services/kodi-eventserver.xml
+%{_libdir}/firewalld/services/kodi-http.xml
+%{_libdir}/firewalld/services/kodi-jsonrpc.xml
 
 %if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
@@ -588,63 +549,94 @@
 %{_unitdir}/kodi.service
 %endif
 
-%{_libdir}/kodi/AddOptions.cmake
-%{_libdir}/kodi/AddonHelpers.cmake
-%{_libdir}/kodi/ArchSetup.cmake
-%{_libdir}/kodi/CheckCommits.cmake
-%{_libdir}/kodi/CheckTargetPlatform.cmake
-%{_libdir}/kodi/GenerateVersionedFiles.cmake
-%{_libdir}/kodi/GeneratorSetup.cmake
-%{_libdir}/kodi/HandleDepends.cmake
-%{_libdir}/kodi/KodiConfig.cmake
-%{_libdir}/kodi/Macros.cmake
-%{_libdir}/kodi/PrepareEnv.cmake
-%{_libdir}/kodi/ProjectMacros.cmake
-%{_libdir}/kodi/CMakeHelpers.cmake
-%{_libdir}/kodi/Uninstall.cmake
-
+%dir %{_datadir}/kodi/cmake
+%{_datadir}/kodi/cmake/KodiConfig.cmake
+%{_datadir}/kodi/cmake/AddonHelpers.cmake
+%{_datadir}/kodi/cmake/AddOptions.cmake
+%{_datadir}/kodi/cmake/ArchSetup.cmake
+%{_datadir}/kodi/cmake/CheckCommits.cmake
+%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
+%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GeneratorSetup.cmake
+%{_datadir}/kodi/cmake/HandleDepends.cmake
+%{_datadir}/kodi/cmake/Macros.cmake
+%{_datadir}/kodi/cmake/PrepareEnv.cmake
+%{_datadir}/kodi/cmake/ProjectMacros.cmake
+%{_datadir}/kodi/cmake/PathSetup.cmake
 
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/DVDDemuxPacket.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/libXBMC_addon.h
-%{_includedir}/kodi/libXBMC_codec.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_inputstream.h
-%{_includedir}/kodi/libKODI_peripheral.h
-%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_epg_types.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
-%{_includedir}/kodi/xbmc_codec_types.h
-%{_includedir}/kodi/xbmc_epg_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/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/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/xbmc_scr_dll.h
-%{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_vis_dll.h
-%{_includedir}/kodi/xbmc_vis_types.h
-%{_includedir}/kodi/xbmc_audioenc_dll.h
-%{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/kodi_audiodec_dll.h
-%{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/kodi_adsp_dll.h
-%{_includedir}/kodi/kodi_adsp_types.h
-%{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/kodi_inputstream_dll.h
-%{_includedir}/kodi/kodi_inputstream_types.h
-%{_includedir}/kodi/kodi_peripheral_callbacks.h
-%{_includedir}/kodi/kodi_peripheral_dll.h
-%{_includedir}/kodi/kodi_peripheral_types.h
-%{_includedir}/kodi/kodi_peripheral_utils.hpp
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/kodi_vfs_utils.hpp
-
-
+%{_includedir}/kodi/StreamCodec.h
+%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
+%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
 %changelog

kodi.spec Changed

@@ -18,13 +18,13 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Krypton
-%define ffmpeg_version 3.1.11-Krypton-17.5
+%define kodi_version Leia
+%define ffmpeg_version 4.0.3-Leia-RC5
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%define dev_build 1
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
-%bcond_with sysffmpeg
+%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
 %define kodi_platform none
@@ -40,11 +40,13 @@
 %endif
 #
 %bcond_without kodi_libbluray
+# 
+%bcond_without systemd
 
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        17.6
+Version:        18.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -56,28 +58,39 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-Source20:       crossguid-8f399e8bd4.tar.gz
-# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
-Source21:       libdvdnav-master.tar.gz
-Source22:       libdvdcss-master.tar.gz
-Source23:       libdvdread-master.tar.gz
+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
+Source24:       http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
+Source25:       http://mirrors.kodi.tv/build-deps/sources/rapidjson-1.1.0.tar.gz
+Source26:       http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.9.0.tar.gz
+Source27:       http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 %if %{without sysffmpeg}
-# DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
-Patch0:         kodi.arm.patch
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         kodi.aarch64.patch
-Patch5:         kodi-tools-libdir.patch
+#Patch0:         kodi.arm.patch
+##Patch1:         no-xbmc-symbolic-link.patch
+##Patch2:         kodi-texturepacker.patch
+##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
+Patch9:		kodi.sqlite.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gawk
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+BuildRequires:  ghostscript
+BuildRequires:  groff-full
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python2)
@@ -93,24 +106,24 @@
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(yajl) >= 2
-%if 0%{?suse_version} > 1320
+BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
-%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(sqlite3) 
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(lirc)
 %if %{with kodi_libbluray}
 BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libpulse) >= 1.0
 BuildRequires:  pkgconfig(avahi-client)
@@ -130,15 +143,15 @@
 BuildRequires:  pkgconfig(libcec) >= 4.0.0
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
-BuildRequires:  pkgconfig(libcap)
+BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
-BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
-BuildRequires:  pkgconfig(libavformat) >= 56.25.101
-BuildRequires:  pkgconfig(libavutil) >= 54.20.100
-BuildRequires:  pkgconfig(libpostproc) >= 53.3.100
-BuildRequires:  pkgconfig(libswscale) >= 3.1.101
-BuildRequires:  pkgconfig(libswresample) >= 1.1.100
+BuildRequires:  pkgconfig(libavcodec) >= 58.18.100
+BuildRequires:  pkgconfig(libavfilter) >= 6.107.100
+BuildRequires:  pkgconfig(libavformat) >= 58.12.100
+BuildRequires:  pkgconfig(libavutil) >= 56.14.100
+BuildRequires:  pkgconfig(libpostproc) >= 54.7.100
+BuildRequires:  pkgconfig(libswscale) >= 4.8.100
+BuildRequires:  pkgconfig(libswresample) >= 3.1.100
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -162,7 +175,6 @@
 BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libva) >= 0.35.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(opus)
@@ -170,7 +182,6 @@
 BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vpx) >= 1.3.0
 BuildRequires:  pkgconfig(x11)
@@ -197,8 +208,13 @@
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+%if 0%{?suse_version} < 1500
 BuildRequires:  pkgconfig(libva) >= 0.38
 BuildRequires:  pkgconfig(libva-x11) >= 0.38
+%else
+BuildRequires:  pkgconfig(libva) >= 1.0.0
+BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+%endif
 %endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
@@ -230,9 +246,10 @@
 # TexturePacker
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
-BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  libjpeg8-devel
 BuildRequires:  lzo-devel
 #
+%{?systemd_requires}
 
 # kodi needs libnfs to access nfs sources, it is not automatically required
 Requires:       libnfs
@@ -240,7 +257,7 @@
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -258,7 +275,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{without kodi_with_X11}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -269,21 +286,20 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
+%patch6
+%patch7
+%patch8 -p1
+%patch9
 
 # Remove build time references so build-compare can do its work
-FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
-FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
-  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-done
-# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
@@ -294,110 +310,45 @@
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/linux/*.cpp
-
-cp %{SOURCE20} tools/depends/target/crossguid
-cp %{SOURCE21} tools/depends/target/libdvdnav
-cp %{SOURCE22} tools/depends/target/libdvdcss
-cp %{SOURCE23} tools/depends/target/libdvdread
-%if %{without sysffmpeg}
-cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}.tar.gz
-%endif
+    xbmc/platform/linux/*.cpp
 
 %build
-export DVD_LIB=%{_lib}
-export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
-export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.6-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # Fix for missing 'l' alias
 alias l='ls -alF'
-# build crossguid
-make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
-
-chmod +x bootstrap
-./bootstrap
-
-# add crossguid to INCLUDES and LIBS
-export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
-export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-%configure \
-%if %{with sysffmpeg}
-    --with-ffmpeg=shared \
-%endif
-    --disable-shared-lib \
-    --disable-debug \
-    --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
-    --disable-openmax \
-    --disable-tegra \
-    --disable-profiling \
-    --enable-x11 \
-    --disable-ccache \
-    --enable-alsa \
-    --enable-dbus \
-    --enable-pulse \
-    --enable-ssh \
-    --enable-samba \
-    --enable-nfs \
-    --enable-airplay \
-    --disable-airtunes \
-    --enable-upnp \
-    --enable-mid \
-    --enable-avahi \
-    --disable-mdnsembedded \
-    --disable-non-free \
-    --enable-mysql \
-    --enable-webserver \
-    --enable-optical-drive \
-    --disable-libbluray \
-    --enable-libxslt \
-    --enable-texturepacker \
-    --enable-udev \
-    --disable-libusb \
-    --enable-libcec \
-    --enable-lcms2 \
-    --enable-libbluetooth \
-    --enable-libcap \
-    --disable-gtest \
-    --disable-codec \
-    --disable-libav-compat \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%endif
-    --with-platform=%{kodi_platform} \
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%if %{without kodi_with_X11}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
+
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
 %if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
+    -DVERBOSE=ON \
 %endif
-    --disable-static
-
-make -O %{?_smp_mflags} V=1|| l
-#%%{?_smp_mflags}
+    -DCMAKE_C_COMPILER=gcc-7 \
+    -DCMAKE_CXX_COMPILER=g++-7 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DENABLE_INTERNAL_RapidJSON=ON \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DENABLE_INTERNAL_FFMPEG=OFF \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DFLATBUFFERS_URL=%{SOURCE26} \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DFSTRCMP_URL=%{SOURCE27} \
+    -DBUILD_SHARED_LIBS=1 
+    
+make -O %{?_smp_mflags} V=1 CC=/usr/bin/gcc-7 CXX=/usr/bin/g++-7 || l
 
 %install
+pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 #make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
@@ -414,10 +365,6 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
-# copy manpages
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -435,6 +382,11 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
+# copy manpages
+popd
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
@@ -455,22 +407,16 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
+%{_libdir}/kodi/kodi-x11
 %endif
-%{_bindir}/kodi-standalone
-%dir %{_libdir}/kodi/addons
-%dir %{_libdir}/kodi/addons/library.xbmc.addon/
-%{_libdir}/kodi/addons/library.xbmc.addon/*
-%dir %{_libdir}/kodi/addons/library.xbmc.codec/
-%{_libdir}/kodi/addons/library.xbmc.codec/*
-%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
-%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
 %{_datadir}/applications/kodi.desktop
 %{_datadir}/icons/*
@@ -489,8 +435,8 @@
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
 %{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/kodi.game
-%{_kodi_addons_dir}/kodi.game/*
+%dir %{_kodi_addons_dir}/game.controller.snes
+%{_kodi_addons_dir}/game.controller.snes/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -505,12 +451,14 @@
 %{_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.tvdb.com/
-%{_kodi_addons_dir}/metadata.tvdb.com/*
+%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/
+%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -525,8 +473,6 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
-%dir %{_kodi_addons_dir}/xbmc.codec/
-%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -537,50 +483,65 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
-%dir %{_kodi_addons_dir}/xbmc.pvr/
-%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
-%dir %{_kodi_addons_dir}/kodi.audiodecoder/
-%{_kodi_addons_dir}/kodi.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.guilib/
-%{_kodi_addons_dir}/kodi.guilib/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
-%dir %{_kodi_addons_dir}/xbmc.audioencoder/
-%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
-%dir %{_kodi_addons_dir}/kodi.adsp
-%{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.inputstream
-%{_kodi_addons_dir}/kodi.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.peripheral
-%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
+%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
+%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
 %dir %{_kodi_addons_dir}/skin.estouchy
 %{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
-%dir %{_libdir}/kodi/addons/library.kodi.inputstream
-%{_libdir}/kodi/addons/library.kodi.inputstream/*
-%dir %{_libdir}/kodi/addons/library.kodi.peripheral
-%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
+%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
+%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.general
+%{_kodi_addons_dir}/kodi.binary.global.general/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.gui
+%{_kodi_addons_dir}/kodi.binary.global.gui/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.main
+%{_kodi_addons_dir}/kodi.binary.global.main/*
+%dir %{_kodi_addons_dir}/kodi.binary.global.network
+%{_kodi_addons_dir}/kodi.binary.global.network/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
+%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.game
+%{_kodi_addons_dir}/kodi.binary.instance.game/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
+%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
+%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
+%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
+%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
+%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
+%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
+%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
+%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
+%dir %{_kodi_addons_dir}/script.module.pycryptodome
+%{_kodi_addons_dir}/script.module.pycryptodome/*
+%dir %{_libdir}/firewalld
+%dir %{_libdir}/firewalld/services
+%{_libdir}/firewalld/services/kodi-eventserver.xml
+%{_libdir}/firewalld/services/kodi-http.xml
+%{_libdir}/firewalld/services/kodi-jsonrpc.xml
 
 %if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
@@ -588,63 +549,94 @@
 %{_unitdir}/kodi.service
 %endif
 
-%{_libdir}/kodi/AddOptions.cmake
-%{_libdir}/kodi/AddonHelpers.cmake
-%{_libdir}/kodi/ArchSetup.cmake
-%{_libdir}/kodi/CheckCommits.cmake
-%{_libdir}/kodi/CheckTargetPlatform.cmake
-%{_libdir}/kodi/GenerateVersionedFiles.cmake
-%{_libdir}/kodi/GeneratorSetup.cmake
-%{_libdir}/kodi/HandleDepends.cmake
-%{_libdir}/kodi/KodiConfig.cmake
-%{_libdir}/kodi/Macros.cmake
-%{_libdir}/kodi/PrepareEnv.cmake
-%{_libdir}/kodi/ProjectMacros.cmake
-%{_libdir}/kodi/CMakeHelpers.cmake
-%{_libdir}/kodi/Uninstall.cmake
-
+%dir %{_datadir}/kodi/cmake
+%{_datadir}/kodi/cmake/KodiConfig.cmake
+%{_datadir}/kodi/cmake/AddonHelpers.cmake
+%{_datadir}/kodi/cmake/AddOptions.cmake
+%{_datadir}/kodi/cmake/ArchSetup.cmake
+%{_datadir}/kodi/cmake/CheckCommits.cmake
+%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
+%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GeneratorSetup.cmake
+%{_datadir}/kodi/cmake/HandleDepends.cmake
+%{_datadir}/kodi/cmake/Macros.cmake
+%{_datadir}/kodi/cmake/PrepareEnv.cmake
+%{_datadir}/kodi/cmake/ProjectMacros.cmake
+%{_datadir}/kodi/cmake/PathSetup.cmake
 
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%{_includedir}/kodi/AEChannelData.h
-%{_includedir}/kodi/DVDDemuxPacket.h
-%{_includedir}/kodi/IFileTypes.h
-%{_includedir}/kodi/libXBMC_addon.h
-%{_includedir}/kodi/libXBMC_codec.h
-%{_includedir}/kodi/libXBMC_pvr.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
-%{_includedir}/kodi/libKODI_guilib.h
-%{_includedir}/kodi/libKODI_inputstream.h
-%{_includedir}/kodi/libKODI_peripheral.h
-%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_epg_types.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
-%{_includedir}/kodi/xbmc_codec_types.h
-%{_includedir}/kodi/xbmc_epg_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/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/versions.h
 %{_includedir}/kodi/xbmc_pvr_dll.h
 %{_includedir}/kodi/xbmc_pvr_types.h
-%{_includedir}/kodi/xbmc_scr_dll.h
-%{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_vis_dll.h
-%{_includedir}/kodi/xbmc_vis_types.h
-%{_includedir}/kodi/xbmc_audioenc_dll.h
-%{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/kodi_audiodec_dll.h
-%{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/kodi_adsp_dll.h
-%{_includedir}/kodi/kodi_adsp_types.h
-%{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/kodi_inputstream_dll.h
-%{_includedir}/kodi/kodi_inputstream_types.h
-%{_includedir}/kodi/kodi_peripheral_callbacks.h
-%{_includedir}/kodi/kodi_peripheral_dll.h
-%{_includedir}/kodi/kodi_peripheral_types.h
-%{_includedir}/kodi/kodi_peripheral_utils.hpp
-%{_includedir}/kodi/kodi_vfs_types.h
-%{_includedir}/kodi/kodi_vfs_utils.hpp
-
-
+%{_includedir}/kodi/StreamCodec.h
+%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
+%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
 %changelog