Packman Build Service PMBS

Changes of Revision 63

kodi-noX-raspberry-pi.spec Changed

@@ -19,178 +19,190 @@
 # 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.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
+# WARNING: Build with bundled ffmpeg until version 18.0 is reached
+%bcond_with sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform raspberry-pi
+%define kodi_player omxplayer
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform raspberry-pi
-%define kodi_player omxplayer
+ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        17.1rc1
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
-Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 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
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  boost-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz - TO CHANGE
+Source21:       libdvdnav-kodi-deps-leia.tar.gz
+Source22:       libdvdcss-kodi-deps-leia.tar.gz
+Source23:       libdvdread-kodi-deps-leia.tar.gz
+Source24:       fmt-3.0.1.tar.gz
+Source25:       rapidjson-1.1.0.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
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
+# need gcc5
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  libyajl-devel >= 2
+BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
-BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  shairplay-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
+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
+%else
+BuildRequires:  ladspa-devel
+BuildRequires:  libgsm-devel
+BuildRequires:  pkg-config
+BuildRequires:  yasm
+BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(celt) >= 0.11.0
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
-%endif
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(libdca)
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-#BuildRequires:  pkgconfig(libswresample) = 1.2.101
-BuildRequires:  pkgconfig(libtiff-4)
-BuildRequires:  pkgconfig(libudev)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+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)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-render)
+BuildRequires:  pkgconfig(xcb-shape)
+BuildRequires:  pkgconfig(xcb-shm)
+BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  pkgconfig(opencore-amrnb)
+BuildRequires:  pkgconfig(twolame)
+BuildRequires:  pkgconfig(x264)
+BuildRequires:  pkgconfig(x265)
 %endif
-BuildRequires:  pkgconfig(uuid)
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -201,28 +213,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  libjpeg8-devel
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -240,7 +261,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -250,130 +271,76 @@
 Development files for Kodi Media Center
 
 %prep
-%setup -q -n xbmc-%{version}-%{kodi_version}
-%patch1
-%patch2
-%patch3
-%patch4 -p0
-#%patch6 -p1
+#%setup -q -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version} 
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
 
 # 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
+#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
+#for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
+#  sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
+#done
 
-# Set the final version string 
+# Set the final version string
 cp %{SOURCE3} VERSION
 
 # 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
+#sed -i \
+#    -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+#    xbmc/linux/*.cpp
 
 %build
-
-# 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 \
-    --disable-libbluray \
-    --with-ffmpeg=shared \
-    --enable-airplay \
-    --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
-    --enable-ssh \
-    --enable-texturepacker \
-    --enable-upnp \
-    --enable-webserver \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%else
-    --disable-gles \
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
-%if "%{kodi_platform}" != "none"
-    --with-platform=%{kodi_platform} \
-%endif
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
-%endif
-%if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
-%endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    -DENABLE_INTERNAL_FMT=1 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_RapidJSON=1 \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DBUILD_DIR=build \
+    -DBUILD_SHARED_LIBS=1 \
+    -DNEED_SUDO=FALSE \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}
+#    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi 
+
+#cmake --build . -- VERBOSE=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} VERBOSE=1
 
-make V=1 -j2
-#%{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
+cd build
+#make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -383,8 +350,8 @@
 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
+#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
@@ -403,9 +370,9 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/kodi.desktop
+#desktop-file-install \
+# --dir=%{buildroot}%{_datadir}/applications \
+# %{buildroot}%{_datadir}/applications/kodi.desktop
 
 %fdupes %{buildroot}
 
@@ -423,25 +390,26 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc copying.txt LICENSE.GPL version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%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/*
+%{_libdir}/kodi/kodi-x11
+%endif
+#%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/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -452,13 +420,13 @@
 %{_datadir}/kodi/privacy-policy.txt
 %{_libdir}/kodi/system/*
 %{_datadir}/kodi/userdata/*
-%{_mandir}/man1/kodi.1.gz
-%{_mandir}/man1/kodi-standalone.1.gz
+#%{_mandir}/man1/kodi.1.gz
+#%{_mandir}/man1/kodi-standalone.1.gz
 %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/*
+%{_kodi_addons_dir}/game.controller.default/*
+#%dir %{_kodi_addons_dir}/kodi.game
+#%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -467,14 +435,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
-%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
@@ -495,8 +463,8 @@
 %{_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.codec/
+#%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -507,114 +475,177 @@
 %{_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.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}/kodi.audiodecoder/
+#%{_kodi_addons_dir}/kodi.audiodecoder/*
+#%dir %{_kodi_addons_dir}/kodi.guilib/
+#%{_kodi_addons_dir}/kodi.guilib/*
 %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}/kodi.adsp
+#%{_kodi_addons_dir}/kodi.adsp/*
 %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}/kodi.peripheral
+#%{_kodi_addons_dir}/kodi.peripheral/*
 %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/*
-
-%if %{noX_build}
+%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.adsp
+%{_kodi_addons_dir}/kodi.binary.instance.adsp/*
+%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}/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/*
+
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_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/AudioEngine.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
+%{_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/addon-instance
+%{_includedir}/kodi/addon-instance/VideoCodec.h
+%{_includedir}/kodi/addon-instance/AudioDSP.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

@@ -19,178 +19,190 @@
 # 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.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
+# WARNING: Build with bundled ffmpeg until version 18.0 is reached
+%bcond_with sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform raspberry-pi2
+%define kodi_player omxplayer
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform raspberry-pi2
-%define kodi_player omxplayer
+ExclusiveArch: armv7l armv7hl
 
 Name:           kodi-noX-raspberry-pi2
-Version:        17.1rc1
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
-Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 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
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  boost-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz - TO CHANGE
+Source21:       libdvdnav-kodi-deps-leia.tar.gz
+Source22:       libdvdcss-kodi-deps-leia.tar.gz
+Source23:       libdvdread-kodi-deps-leia.tar.gz
+Source24:       fmt-3.0.1.tar.gz
+Source25:       rapidjson-1.1.0.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
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
+# need gcc5
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  libyajl-devel >= 2
+BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
-BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  shairplay-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
+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
+%else
+BuildRequires:  ladspa-devel
+BuildRequires:  libgsm-devel
+BuildRequires:  pkg-config
+BuildRequires:  yasm
+BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(celt) >= 0.11.0
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
-%endif
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(libdca)
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-#BuildRequires:  pkgconfig(libswresample) = 1.2.101
-BuildRequires:  pkgconfig(libtiff-4)
-BuildRequires:  pkgconfig(libudev)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+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)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-render)
+BuildRequires:  pkgconfig(xcb-shape)
+BuildRequires:  pkgconfig(xcb-shm)
+BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  pkgconfig(opencore-amrnb)
+BuildRequires:  pkgconfig(twolame)
+BuildRequires:  pkgconfig(x264)
+BuildRequires:  pkgconfig(x265)
 %endif
-BuildRequires:  pkgconfig(uuid)
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -201,28 +213,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  libjpeg8-devel
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -240,7 +261,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -250,130 +271,76 @@
 Development files for Kodi Media Center
 
 %prep
-%setup -q -n xbmc-%{version}-%{kodi_version}
-%patch1
-%patch2
-%patch3
-%patch4 -p0
-#%patch6 -p1
+#%setup -q -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version} 
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
 
 # 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
+#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
+#for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
+#  sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
+#done
 
-# Set the final version string 
+# Set the final version string
 cp %{SOURCE3} VERSION
 
 # 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
+#sed -i \
+#    -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+#    xbmc/linux/*.cpp
 
 %build
-
-# 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 \
-    --disable-libbluray \
-    --with-ffmpeg=shared \
-    --enable-airplay \
-    --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
-    --enable-ssh \
-    --enable-texturepacker \
-    --enable-upnp \
-    --enable-webserver \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%else
-    --disable-gles \
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
-%if "%{kodi_platform}" != "none"
-    --with-platform=%{kodi_platform} \
-%endif
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
-%endif
-%if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
-%endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    -DENABLE_INTERNAL_FMT=1 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_RapidJSON=1 \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DBUILD_DIR=build \
+    -DBUILD_SHARED_LIBS=1 \
+    -DNEED_SUDO=FALSE \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}
+#    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi 
+
+#cmake --build . -- VERBOSE=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} VERBOSE=1
 
-make V=1 -j2
-#%{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
+cd build
+#make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -383,8 +350,8 @@
 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
+#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
@@ -403,9 +370,9 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/kodi.desktop
+#desktop-file-install \
+# --dir=%{buildroot}%{_datadir}/applications \
+# %{buildroot}%{_datadir}/applications/kodi.desktop
 
 %fdupes %{buildroot}
 
@@ -423,25 +390,26 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc copying.txt LICENSE.GPL version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%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/*
+%{_libdir}/kodi/kodi-x11
+%endif
+#%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/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -452,13 +420,13 @@
 %{_datadir}/kodi/privacy-policy.txt
 %{_libdir}/kodi/system/*
 %{_datadir}/kodi/userdata/*
-%{_mandir}/man1/kodi.1.gz
-%{_mandir}/man1/kodi-standalone.1.gz
+#%{_mandir}/man1/kodi.1.gz
+#%{_mandir}/man1/kodi-standalone.1.gz
 %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/*
+%{_kodi_addons_dir}/game.controller.default/*
+#%dir %{_kodi_addons_dir}/kodi.game
+#%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -467,14 +435,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
-%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
@@ -495,8 +463,8 @@
 %{_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.codec/
+#%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -507,114 +475,177 @@
 %{_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.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}/kodi.audiodecoder/
+#%{_kodi_addons_dir}/kodi.audiodecoder/*
+#%dir %{_kodi_addons_dir}/kodi.guilib/
+#%{_kodi_addons_dir}/kodi.guilib/*
 %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}/kodi.adsp
+#%{_kodi_addons_dir}/kodi.adsp/*
 %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}/kodi.peripheral
+#%{_kodi_addons_dir}/kodi.peripheral/*
 %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/*
-
-%if %{noX_build}
+%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.adsp
+%{_kodi_addons_dir}/kodi.binary.instance.adsp/*
+%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}/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/*
+
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_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/AudioEngine.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
+%{_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/addon-instance
+%{_includedir}/kodi/addon-instance/VideoCodec.h
+%{_includedir}/kodi/addon-instance/AudioDSP.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

@@ -19,178 +19,190 @@
 # 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.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
+# WARNING: Build with bundled ffmpeg until version 18.0 is reached
+%bcond_with sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%define noX_build 1
-%if %{noX_build}
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
+%bcond_with kodi_with_X11
+%define kodi_platform none
+%define kodi_player none
+
+%if %{with kodi_with_X11}
+%bcond_without enable_opengl
+%bcond_with enable_opengles
 %else
-%ifarch %arm armv6l armv6hl
+# no X build needs openGL ES
 %bcond_with enable_opengl
 %bcond_without enable_opengles
-%else
-%bcond_without enable_opengl
-%bcond_with enable_opengles
-%endif
 %endif
+#
 %bcond_without kodi_libbluray
 
-%define kodi_platform none
-%define kodi_player none
+ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        17.1rc1
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://kodi.tv/
-Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+#Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
+Source0:        https://github.com/xbmc/xbmc/archive/%{version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 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
-Patch1:         no-xbmc-symbolic-link.patch
-Patch2:         kodi-texturepacker.patch
-Patch3:         crossguid_build64.patch
-Patch4:         add_rpi2_support.patch
-#Patch6:         kodi.cximage.gcc6.patch
-BuildRequires:  avahi-devel
-BuildRequires:  boost-devel
-BuildRequires:  byacc
-BuildRequires:  ccache
-# needed to delete the fixed rpath introduced by smbclient
-BuildRequires:  chrpath
-BuildRequires:  cmake
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz - TO CHANGE
+Source21:       libdvdnav-kodi-deps-leia.tar.gz
+Source22:       libdvdcss-kodi-deps-leia.tar.gz
+Source23:       libdvdread-kodi-deps-leia.tar.gz
+Source24:       fmt-3.0.1.tar.gz
+Source25:       rapidjson-1.1.0.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
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  flex
-%if %{with enable_opengl}
-BuildRequires:  ftgl-devel
-%endif
+BuildRequires:  gawk
+# need gcc5
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
-BuildRequires:  giflib-devel
-BuildRequires:  glibc-devel
-BuildRequires:  gmp-devel
-BuildRequires:  gperf
-BuildRequires:  hicolor-icon-theme
-BuildRequires:  java
-BuildRequires:  libcap-devel
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libgpg-error-devel
-BuildRequires:  libjasper-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libmysqlclient-devel
-#BuildRequires:  libsidplay2-1
-BuildRequires:  libstdc++-devel
 BuildRequires:  libtool
-BuildRequires:  libyajl-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(python2)
+BuildRequires:  libmysqlclient-devel
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  lzo-devel
-BuildRequires:  nasm
-BuildRequires:  readline-devel
-BuildRequires:  shairplay-devel
-#BuildRequires:  sidplay-libs-devel
-BuildRequires:  swig
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
-BuildRequires:  unzip
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  libyajl-devel >= 2
+BuildRequires:  pkgconfig(libidn2)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(taglib) >= 1.9
+BuildRequires:  pkgconfig(libcdio)
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
 %endif
-BuildRequires:  yasm
-BuildRequires:  zip
-BuildRequires:  libx265-devel
-
-BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(dbus-1)
+# libmicrohttpd > 0.9.30
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libpulse) >= 1.0
+BuildRequires:  pkgconfig(avahi-client)
+%if %{with kodi_with_X11}
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(egl)
+%endif
+BuildRequires:  pkgconfig(libssh)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  shairplay-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
+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
+%else
+BuildRequires:  ladspa-devel
+BuildRequires:  libgsm-devel
+BuildRequires:  pkg-config
+BuildRequires:  yasm
+BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(dcadec)
-BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(celt) >= 0.11.0
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(expat)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-%endif
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libass) >= 0.9.7
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
-#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
-#BuildRequires:  pkgconfig(libavformat) = 57.25.100
-#BuildRequires:  pkgconfig(libavutil) = 55.17.103
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
-%endif
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(libdca)
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libmodplug)
-BuildRequires:  pkgconfig(libmpeg2)
-BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  pkgconfig(libnfs)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libplist)
-BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  pkgconfig(libssh)
-#BuildRequires:  pkgconfig(libswresample) = 1.2.101
-BuildRequires:  pkgconfig(libtiff-4)
-BuildRequires:  pkgconfig(libudev)
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(libva)
-%endif
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(mad)
-BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(python)
-BuildRequires:  pkgconfig(samplerate)
-%if !%{noX_build}
-BuildRequires:  pkgconfig(sdl2)
-%endif
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(taglib) >= 1.8
-BuildRequires:  pkgconfig(tinyxml2)
-%if 0%{?suse_version} > 1320
-# Otherwise fails with configure error on libcec because udev.pc file is not found
-BuildRequires:  pkgconfig(udev)
+BuildRequires:  pkgconfig(opus)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+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)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-render)
+BuildRequires:  pkgconfig(xcb-shape)
+BuildRequires:  pkgconfig(xcb-shm)
+BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(librtmp)
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  pkgconfig(opencore-amrnb)
+BuildRequires:  pkgconfig(twolame)
+BuildRequires:  pkgconfig(x264)
+BuildRequires:  pkgconfig(x265)
 %endif
-BuildRequires:  pkgconfig(uuid)
+BuildRequires:  swig
+BuildRequires:  java
+BuildRequires:  doxygen
 %if %{with enable_opengl}
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(libva) >= 0.38
+BuildRequires:  pkgconfig(libva-x11) >= 0.38
 %endif
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(zlib)
-
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -201,28 +213,37 @@
 %endif
 %endif
 %endif
-
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-# Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-# glxinfo is needed to check hw accel
-%if 0%{?suse_version} >= 1220
-%if !%{noX_build}
-Requires:       Mesa-demo-x
-Requires:       xdpyinfo
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  unzip
+BuildRequires:  zip
+%ifarch %ix86
+BuildRequires:  nasm
 %endif
+%if %{dev_build}
+BuildRequires:  ccache
 %endif
 
+# cpluff
+BuildRequires:  pkgconfig(expat)
+
+# TexturePacker
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  giflib-devel
+BuildRequires:  libjpeg8-devel
+BuildRequires:  lzo-devel
+#
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExcludeArch:    ppc64
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -240,7 +261,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{noX_build}
+%if %{with kodi_with_X11}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -250,130 +271,76 @@
 Development files for Kodi Media Center
 
 %prep
-%setup -q -n xbmc-%{version}-%{kodi_version}
-%patch1
-%patch2
-%patch3
-%patch4 -p0
-#%patch6 -p1
+#%setup -q -n xbmc-%{version}-%{kodi_version}
+%setup -q -n xbmc-%{version} 
+
+#%patch0
+#%patch1
+#%patch2
+#%patch3
+#%patch4
+#%patch5
 
 # 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
+#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
+#for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
+#  sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
+#done
 
-# Set the final version string 
+# Set the final version string
 cp %{SOURCE3} VERSION
 
 # 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
+#sed -i \
+#    -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+#    xbmc/linux/*.cpp
 
 %build
-
-# 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 \
-    --disable-libbluray \
-    --with-ffmpeg=shared \
-    --enable-airplay \
-    --enable-alsa \
-    --enable-avahi \
-    --enable-libcap \
-    --enable-libcec \
-    --enable-libusb \
-    --enable-mid \
-    --enable-mysql \
-    --enable-nfs \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-shared \
-    --enable-ssh \
-    --enable-texturepacker \
-    --enable-upnp \
-    --enable-webserver \
-%if %{with enable_opengl}
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-gl \
-%else
-    --disable-vaapi \
-    --disable-vdpau \
-    --disable-gl \
-%endif
-%if %{with enable_opengles}
-    --enable-gles \
-%else
-    --disable-gles \
+%cmake \
+%ifarch i586
+    -DCMAKE_C_FLAGS='-msse' \
 %endif
-%if "%{kodi_platform}" != "none"
-    --with-platform=%{kodi_platform} \
-%endif
-%if %{with kodi_libbluray}
-    --enable-libbluray \
-%endif
-%if "%{kodi_player}" != "none"
-    --enable-player="%{kodi_player}" \
-%endif
-%ifarch armv7l armv7hl
-    --enable-tegra \
-    --disable-neon \
-%endif
-%if %{noX_build}
-    --disable-x11 \
-    --disable-xrandr \
-    --disable-sdl \
-    --disable-joystick \
-%endif
-%if %{dev_build}
-    --enable-debug \
-    --enable-ccache \
-%endif
-%if !%{dev_build}
-    --disable-debug \
-    --disable-ccache \
-%endif
-    --disable-optimizations \
-    --disable-static 
+    -DENABLE_INTERNAL_FMT=1 \
+    -DFMT_URL=%{SOURCE24} \
+    -DENABLE_INTERNAL_RapidJSON=1 \
+    -DRapidJSON_URL=%{SOURCE25} \
+    -DFFMPEG_URL=%{SOURCE30} \
+    -DCROSSGUID_URL=%{SOURCE20} \
+    -DLIBDVDNAV_URL=%{SOURCE21} \
+    -DLIBDVDCSS_URL=%{SOURCE22} \
+    -DLIBDVDREAD_URL=%{SOURCE23} \
+    -DBUILD_DIR=build \
+    -DBUILD_SHARED_LIBS=1 \
+    -DNEED_SUDO=FALSE \
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}
+#    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi 
+
+#cmake --build . -- VERBOSE=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} VERBOSE=1
 
-make V=1 -j2
-#%{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
+cd build
+#make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make install %{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
 
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 
 # Systemd service file
-%if %{noX_build}
+%if %{without kodi_with_X11}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -383,8 +350,8 @@
 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
+#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
@@ -403,9 +370,9 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/kodi.desktop
+#desktop-file-install \
+# --dir=%{buildroot}%{_datadir}/applications \
+# %{buildroot}%{_datadir}/applications/kodi.desktop
 
 %fdupes %{buildroot}
 
@@ -423,25 +390,26 @@
 
 %files
 %defattr(-,root,root)
-%doc copying.txt LICENSE.GPL docs/README.linux
+%doc copying.txt LICENSE.GPL version.txt 
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
 %{_bindir}/kodi
+%{_bindir}/kodi-standalone
+%{_bindir}/TexturePacker
 %dir %{_libdir}/kodi
-%{_libdir}/kodi/kodi.bin
-%if !%{noX_build}
+%if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
-%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/*
+%{_libdir}/kodi/kodi-x11
+%endif
+#%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/hicolor/*/*/*.png
+%{_datadir}/icons/*
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -452,13 +420,13 @@
 %{_datadir}/kodi/privacy-policy.txt
 %{_libdir}/kodi/system/*
 %{_datadir}/kodi/userdata/*
-%{_mandir}/man1/kodi.1.gz
-%{_mandir}/man1/kodi-standalone.1.gz
+#%{_mandir}/man1/kodi.1.gz
+#%{_mandir}/man1/kodi-standalone.1.gz
 %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/*
+%{_kodi_addons_dir}/game.controller.default/*
+#%dir %{_kodi_addons_dir}/kodi.game
+#%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -467,14 +435,14 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
-%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
-%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
@@ -495,8 +463,8 @@
 %{_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.codec/
+#%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -507,114 +475,177 @@
 %{_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.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}/kodi.audiodecoder/
+#%{_kodi_addons_dir}/kodi.audiodecoder/*
+#%dir %{_kodi_addons_dir}/kodi.guilib/
+#%{_kodi_addons_dir}/kodi.guilib/*
 %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}/kodi.adsp
+#%{_kodi_addons_dir}/kodi.adsp/*
 %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}/kodi.peripheral
+#%{_kodi_addons_dir}/kodi.peripheral/*
 %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/*
-
-%if %{noX_build}
+%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.adsp
+%{_kodi_addons_dir}/kodi.binary.instance.adsp/*
+%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}/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/*
+
+%if %{without kodi_with_X11}
 %{_unitdir}/kodi-noX.service
 %else
 %{_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/AudioEngine.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
+%{_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/addon-instance
+%{_includedir}/kodi/addon-instance/VideoCodec.h
+%{_includedir}/kodi/addon-instance/AudioDSP.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

@@ -22,7 +22,7 @@
 %define ffmpeg_version 3.4-Leia-Alpha-1
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 1
+%define dev_build 0
 # WARNING: Build with bundled ffmpeg until version 18.0 is reached
 %bcond_with sysffmpeg
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
@@ -80,8 +80,8 @@
 BuildRequires:  fdupes
 BuildRequires:  gawk
 # need gcc5
-BuildRequires:  gcc5
-BuildRequires:  gcc5-c++
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(python2)
@@ -326,8 +326,9 @@
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}
 #    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi 
 
-cmake --build . -- VERBOSE=1 %{?_smp_mflags}
-#make -O %{?_smp_mflags} V=1
+#cmake --build . -- VERBOSE=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} VERBOSE=1
+
 
 %install
 cd build
@@ -557,6 +558,7 @@
 %{_unitdir}/kodi.service
 %endif
 
+%dir %{_datadir}/kodi/cmake
 %{_datadir}/kodi/cmake/KodiConfig.cmake
 %{_datadir}/kodi/cmake/AddonHelpers.cmake
 %{_datadir}/kodi/cmake/AddOptions.cmake

_service:download_files:17.1rc1-Krypton.tar.gz Deleted

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp Changed

libdvdcss-master.tar.gz Deleted

libdvdnav-master.tar.gz Deleted

libdvdread-master.tar.gz Deleted