Packman Build Service PMBS

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -19,9 +19,12 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.1.11
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %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)
 %bcond_with kodi_with_X11
 %define kodi_platform raspberry-pi
@@ -58,16 +61,22 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.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}-%{kodi_version}-%{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:  fdupes
 BuildRequires:  gawk
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -85,6 +94,9 @@
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(yajl) >= 2
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(libidn2)
+%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -119,6 +131,7 @@
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(libcap)
+%if %{with sysffmpeg}
 BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
 BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
 BuildRequires:  pkgconfig(libavformat) >= 56.25.101
@@ -126,6 +139,58 @@
 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(celt) >= 0.11.0
+BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
+BuildRequires:  pkgconfig(netcdf)
+BuildRequires:  pkgconfig(ogg)
+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:  swig
 BuildRequires:  java
 BuildRequires:  doxygen
@@ -210,6 +275,7 @@
 %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')
@@ -223,7 +289,7 @@
   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
@@ -235,9 +301,14 @@
 cp %{SOURCE21} tools/depends/target/libdvdnav
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
+%if %{without sysffmpeg}
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+%endif
 
 %build
-
+export DVD_LIB=%{_lib}
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 
@@ -251,20 +322,16 @@
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-
 %configure \
+%if %{with sysffmpeg}
     --with-ffmpeg=shared \
+%endif
     --disable-shared-lib \
     --disable-debug \
     --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
     --disable-openmax \
     --disable-tegra \
     --disable-profiling \
-    --enable-x11 \
     --disable-ccache \
     --enable-alsa \
     --enable-dbus \
@@ -282,7 +349,6 @@
     --enable-mysql \
     --enable-webserver \
     --enable-optical-drive \
-    --disable-libbluray \
     --enable-libxslt \
     --enable-texturepacker \
     --enable-udev \
@@ -298,13 +364,21 @@
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
+%else
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
+%else
+    --disable-gles \
 %endif
     --with-platform=%{kodi_platform} \
 %if %{with kodi_libbluray}
     --enable-libbluray \
+%else
+    --disable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
@@ -314,6 +388,8 @@

kodi-noX-raspberry-pi2.spec Changed

@@ -19,9 +19,12 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.1.11
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %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)
 %bcond_with kodi_with_X11
 %define kodi_platform raspberry-pi2
@@ -58,16 +61,22 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.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}-%{kodi_version}-%{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:  fdupes
 BuildRequires:  gawk
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -85,6 +94,9 @@
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(yajl) >= 2
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(libidn2)
+%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -119,6 +131,7 @@
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(libcap)
+%if %{with sysffmpeg}
 BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
 BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
 BuildRequires:  pkgconfig(libavformat) >= 56.25.101
@@ -126,6 +139,58 @@
 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(celt) >= 0.11.0
+BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
+BuildRequires:  pkgconfig(netcdf)
+BuildRequires:  pkgconfig(ogg)
+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:  swig
 BuildRequires:  java
 BuildRequires:  doxygen
@@ -210,6 +275,7 @@
 %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')
@@ -223,7 +289,7 @@
   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
@@ -235,9 +301,14 @@
 cp %{SOURCE21} tools/depends/target/libdvdnav
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
+%if %{without sysffmpeg}
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+%endif
 
 %build
-
+export DVD_LIB=%{_lib}
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 
@@ -251,20 +322,16 @@
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-
 %configure \
+%if %{with sysffmpeg}
     --with-ffmpeg=shared \
+%endif
     --disable-shared-lib \
     --disable-debug \
     --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
     --disable-openmax \
     --disable-tegra \
     --disable-profiling \
-    --enable-x11 \
     --disable-ccache \
     --enable-alsa \
     --enable-dbus \
@@ -282,7 +349,6 @@
     --enable-mysql \
     --enable-webserver \
     --enable-optical-drive \
-    --disable-libbluray \
     --enable-libxslt \
     --enable-texturepacker \
     --enable-udev \
@@ -298,13 +364,21 @@
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
+%else
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
+%else
+    --disable-gles \
 %endif
     --with-platform=%{kodi_platform} \
 %if %{with kodi_libbluray}
     --enable-libbluray \
+%else
+    --disable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
@@ -314,6 +388,8 @@

kodi-noX.spec Changed

@@ -19,9 +19,12 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.1.11
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %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)
 %bcond_with kodi_with_X11
 %define kodi_platform none
@@ -58,16 +61,22 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.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}-%{kodi_version}-%{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:  fdupes
 BuildRequires:  gawk
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -85,6 +94,9 @@
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(yajl) >= 2
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(libidn2)
+%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -119,6 +131,7 @@
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(libcap)
+%if %{with sysffmpeg}
 BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
 BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
 BuildRequires:  pkgconfig(libavformat) >= 56.25.101
@@ -126,6 +139,58 @@
 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(celt) >= 0.11.0
+BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
+BuildRequires:  pkgconfig(netcdf)
+BuildRequires:  pkgconfig(ogg)
+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:  swig
 BuildRequires:  java
 BuildRequires:  doxygen
@@ -210,6 +275,7 @@
 %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')
@@ -223,7 +289,7 @@
   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
@@ -235,9 +301,14 @@
 cp %{SOURCE21} tools/depends/target/libdvdnav
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
+%if %{without sysffmpeg}
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+%endif
 
 %build
-
+export DVD_LIB=%{_lib}
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 
@@ -251,20 +322,16 @@
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-
 %configure \
+%if %{with sysffmpeg}
     --with-ffmpeg=shared \
+%endif
     --disable-shared-lib \
     --disable-debug \
     --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
     --disable-openmax \
     --disable-tegra \
     --disable-profiling \
-    --enable-x11 \
     --disable-ccache \
     --enable-alsa \
     --enable-dbus \
@@ -282,7 +349,6 @@
     --enable-mysql \
     --enable-webserver \
     --enable-optical-drive \
-    --disable-libbluray \
     --enable-libxslt \
     --enable-texturepacker \
     --enable-udev \
@@ -298,13 +364,21 @@
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
+%else
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
+%else
+    --disable-gles \
 %endif
     --with-platform=%{kodi_platform} \
 %if %{with kodi_libbluray}
     --enable-libbluray \
+%else
+    --disable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
@@ -314,6 +388,8 @@

kodi.spec Changed

@@ -19,9 +19,12 @@
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
 %define kodi_version Krypton
+%define ffmpeg_version 3.1.11
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %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)
 %bcond_without kodi_with_X11
 %define kodi_platform none
@@ -58,16 +61,22 @@
 Source21:       libdvdnav-master.tar.gz
 Source22:       libdvdcss-master.tar.gz
 Source23:       libdvdread-master.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}-%{kodi_version}-%{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:  fdupes
 BuildRequires:  gawk
+BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  pkg-config
@@ -85,6 +94,9 @@
 BuildRequires:  tinyxml-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(yajl) >= 2
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(libidn2)
+%endif
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(fribidi)
@@ -119,6 +131,7 @@
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(libcap)
+%if %{with sysffmpeg}
 BuildRequires:  pkgconfig(libavcodec) >= 56.26.100
 BuildRequires:  pkgconfig(libavfilter) >= 5.11.102
 BuildRequires:  pkgconfig(libavformat) >= 56.25.101
@@ -126,6 +139,58 @@
 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(celt) >= 0.11.0
+BuildRequires:  pkgconfig(enca)
+BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdc1394-2)
+BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
+BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libraw1394)
+BuildRequires:  pkgconfig(libva) >= 0.35.0
+BuildRequires:  pkgconfig(libwebp) >= 0.4
+BuildRequires:  pkgconfig(netcdf)
+BuildRequires:  pkgconfig(ogg)
+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:  swig
 BuildRequires:  java
 BuildRequires:  doxygen
@@ -210,6 +275,7 @@
 %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')
@@ -223,7 +289,7 @@
   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
@@ -235,9 +301,14 @@
 cp %{SOURCE21} tools/depends/target/libdvdnav
 cp %{SOURCE22} tools/depends/target/libdvdcss
 cp %{SOURCE23} tools/depends/target/libdvdread
+%if %{without sysffmpeg}
+cp %{SOURCE30} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_version}-%{kodi_version}-%{version}.tar.gz
+%endif
 
 %build
-
+export DVD_LIB=%{_lib}
+export CSS_LIBS="-L/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/%{_lib} -ldvdcss"
+export CSS_CFLAGS="-I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include -I/data/packages/BUILD/xbmc-17.5-Krypton/tools/depends/target/libdvdcss/dvdcss-install/include/dvdcss"
 # build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 
@@ -251,20 +322,16 @@
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
-
 %configure \
+%if %{with sysffmpeg}
     --with-ffmpeg=shared \
+%endif
     --disable-shared-lib \
     --disable-debug \
     --disable-optimizations \
-    --disable-gl \
-    --disable-gles \
-    --disable-vdpau \
-    --disable-vaapi \
     --disable-openmax \
     --disable-tegra \
     --disable-profiling \
-    --enable-x11 \
     --disable-ccache \
     --enable-alsa \
     --enable-dbus \
@@ -282,7 +349,6 @@
     --enable-mysql \
     --enable-webserver \
     --enable-optical-drive \
-    --disable-libbluray \
     --enable-libxslt \
     --enable-texturepacker \
     --enable-udev \
@@ -298,13 +364,21 @@
     --enable-vaapi \
     --enable-vdpau \
     --enable-gl \
+%else
+    --disable-vdpau \
+    --disable-vaapi \
+    --disable-gl \
 %endif
 %if %{with enable_opengles}
     --enable-gles \
+%else
+    --disable-gles \
 %endif
     --with-platform=%{kodi_platform} \
 %if %{with kodi_libbluray}
     --enable-libbluray \
+%else
+    --disable-libbluray \
 %endif
 %if "%{kodi_player}" != "none"
     --enable-player="%{kodi_player}" \
@@ -314,6 +388,8 @@

kodi-tools-libdir.patch Added

@@ -0,0 +1,89 @@
+Index: tools/depends/target/libdvdread/Makefile
+===================================================================
+--- tools/depends/target/libdvdread/Makefile.orig	2017-11-21 11:15:09.356861040 +0200
++++ tools/depends/target/libdvdread/Makefile	2017-11-22 14:01:17.324102964 +0200
+@@ -3,7 +3,7 @@ include DVDREAD-VERSION
+ DEPS = DVDREAD-VERSION Makefile
+ 
+ # configuration settings
+-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
++config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
+ EXTRA_CFLAGS = -D_XBMC
+ 
+ ifeq ($(CROSS_COMPILING), yes)
+@@ -16,7 +16,7 @@ else
+   ifeq ($(PLATFORM),)
+     PLATFORM = native
+     TARBALLS_LOCATION = $(ROOT_DIR)
+-    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
++    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
+     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
+   endif
+ endif
+@@ -42,7 +42,6 @@ else
+   ARCHIVE=$(LIBNAME)-$(GITREV).tar.gz
+ endif
+ 
+-
+ CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+ 
+ all: .installed-$(PLATFORM)
+Index: lib/libdvd/Makefile.in
+===================================================================
+--- lib/libdvd/Makefile.in.orig	2017-11-21 11:15:09.356861040 +0200
++++ lib/libdvd/Makefile.in	2017-11-21 11:44:59.603860055 +0200
+@@ -6,13 +6,13 @@ CXX=@CXX@
+ 
+ ifeq (@CROSS_COMPILING@,yes)
+   DEPENDS_DIR = $(shell grep "^PREFIX=/" @abs_top_srcdir@/tools/depends/Makefile.include | sed 's/PREFIX=//g')
+-  DVDNAV_A = $(DEPENDS_DIR)/lib/libdvdnav.a
+-  DVDREAD_A = $(DEPENDS_DIR)/lib/libdvdread.a
+-  DVDCSS_A = $(DEPENDS_DIR)/lib/libdvdcss.a
++  DVDNAV_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdnav.a
++  DVDREAD_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdread.a
++  DVDCSS_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdcss.a
+ else
+-  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/lib/libdvdnav.a
+-  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/lib/libdvdread.a
+-  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/lib/libdvdcss.a
++  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/$(DVD_LIB)/libdvdnav.a
++  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/$(DVD_LIB)/libdvdread.a
++  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/$(DVD_LIB)/libdvdcss.a
+ endif
+ 
+ SYSDIR = @abs_top_srcdir@/system/players/VideoPlayer
+Index: tools/depends/target/libdvdcss/Makefile
+===================================================================
+--- tools/depends/target/libdvdcss/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
++++ tools/depends/target/libdvdcss/Makefile	2017-11-22 11:23:22.801643723 +0200
+@@ -19,7 +19,7 @@ RETRIEVE_TOOL := curl -Ls --create-dirs
+ ARCHIVE_TOOL := tar --strip-components=1 -xf
+ 
+ # configuration settings
+-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
++config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
+ 
+ CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+ 
+Index: tools/depends/target/libdvdnav/Makefile
+===================================================================
+--- tools/depends/target/libdvdnav/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
++++ tools/depends/target/libdvdnav/Makefile	2017-11-22 14:01:49.397317647 +0200
+@@ -3,7 +3,7 @@ include DVDNAV-VERSION
+ DEPS = DVDNAV-VERSION Makefile
+ 
+ # configuration settings
+-config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
++config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
+ EXTRA_CFLAGS = -D_XBMC -DHAVE_DVDCSS_DVDCSS_H
+ 
+ ifeq ($(CROSS_COMPILING), yes)
+@@ -16,7 +16,7 @@ else
+   ifeq ($(PLATFORM),)
+     PLATFORM = native
+     TARBALLS_LOCATION = $(ROOT_DIR)
+-    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/lib/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
++    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/$(DVD_LIB)/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
+     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdread/dvdread-install/include -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
+   endif
+ endif

3.1.11-Krypton-17.5.tar.gz Added

libdvdnav-master.tar.gz/src/vm/vmget.c Changed

Changes of Revision 45