Packman Build Service PMBS

Changes of Revision 142

kodi-noX-raspberry-pi.spec Changed

@@ -23,6 +23,8 @@
 %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
@@ -68,11 +70,13 @@
 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
@@ -90,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)
@@ -267,6 +274,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')
@@ -280,7 +288,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
@@ -313,9 +321,10 @@
 %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 \
@@ -383,11 +392,12 @@
 %endif
     --disable-static
 
-make V=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} V=1|| l
+#%%{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} 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
@@ -476,7 +486,7 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/* 
+%{_kodi_addons_dir}/game.controller.default/*
 %dir %{_kodi_addons_dir}/kodi.game
 %{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/

kodi-noX-raspberry-pi2.spec Changed

@@ -23,6 +23,8 @@
 %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
@@ -68,11 +70,13 @@
 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
@@ -90,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)
@@ -267,6 +274,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')
@@ -280,7 +288,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
@@ -313,9 +321,10 @@
 %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 \
@@ -383,11 +392,12 @@
 %endif
     --disable-static
 
-make V=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} V=1|| l
+#%%{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} 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
@@ -476,7 +486,7 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/* 
+%{_kodi_addons_dir}/game.controller.default/*
 %dir %{_kodi_addons_dir}/kodi.game
 %{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/

kodi-noX.spec Changed

@@ -23,6 +23,8 @@
 %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
@@ -68,11 +70,13 @@
 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
@@ -90,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)
@@ -267,6 +274,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')
@@ -280,7 +288,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
@@ -313,9 +321,10 @@
 %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 \
@@ -383,11 +392,12 @@
 %endif
     --disable-static
 
-make V=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} V=1|| l
+#%%{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} 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
@@ -476,7 +486,7 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/* 
+%{_kodi_addons_dir}/game.controller.default/*
 %dir %{_kodi_addons_dir}/kodi.game
 %{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/

kodi.spec Changed

@@ -23,6 +23,8 @@
 %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
@@ -68,11 +70,13 @@
 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
@@ -90,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)
@@ -267,6 +274,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')
@@ -280,7 +288,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
@@ -313,9 +321,10 @@
 %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 \
@@ -383,11 +392,12 @@
 %endif
     --disable-static
 
-make V=1 %{?_smp_mflags}
+make -O %{?_smp_mflags} V=1|| l
+#%%{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%{buildroot} 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
@@ -476,7 +486,7 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/* 
+%{_kodi_addons_dir}/game.controller.default/*
 %dir %{_kodi_addons_dir}/kodi.game
 %{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/