Packman Build Service PMBS

kodi.binary-addons-noX-raspberry-pi.changes Changed

kodi.binary-addons-noX-raspberry-pi2.changes Changed

kodi.binary-addons-noX.changes Changed

kodi.binary-addons-noX-raspberry-pi.spec Changed

@@ -58,11 +58,13 @@
 Patch3:         kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch
 # PATCH-PACKMAN kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch - fixes compiling of screensavers.rsxs with gcc > 4.8, suse_version >= 1320
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
+Patch5:         lib555-missing-xlocale.patch
+Patch6:         pvr.stalker-gcc7.patch
 
-BuildRequires:  autoconf 
+BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  ccache
-BuildRequires:  cmake 
+BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
@@ -106,7 +108,7 @@
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
@@ -125,10 +127,10 @@
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
 
-%description 
+%description
 Binary Addons for Kodi Media Center
 
-%include %{SOURCE1} 
+%include %{SOURCE1}
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
@@ -138,11 +140,11 @@
 %endif
 
 pushd project/cmake/addons
-tar xvf %{SOURCE3} 
+tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires 
+#remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
 tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
@@ -160,14 +162,16 @@
     -DNEED_SUDO=FALSE \
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} 
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
 %if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
-  #patch -p0 < %{PATCH3}
+  #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
   patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  patch -up0 --verbose < %{PATCH5}
+  patch -up4 --verbose < %{PATCH6}
 %endif
 
 # fake buildtime in audiodecoder.qsf
@@ -180,7 +184,7 @@
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
-make VERBOSE=1 %{?_smp_mflags} 
+make VERBOSE=1 %{?_smp_mflags}
 popd
 
 %install
@@ -194,6 +198,6 @@
 %dir %{_datadir}/kodi
 %{_libdir}/kodi/PrepareEnv.cmake
 
-%include %{SOURCE2} 
+%include %{SOURCE2}
 
 %changelog

kodi.binary-addons-noX-raspberry-pi2.spec Changed

@@ -58,11 +58,13 @@
 Patch3:         kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch
 # PATCH-PACKMAN kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch - fixes compiling of screensavers.rsxs with gcc > 4.8, suse_version >= 1320
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
+Patch5:         lib555-missing-xlocale.patch
+Patch6:         pvr.stalker-gcc7.patch
 
-BuildRequires:  autoconf 
+BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  ccache
-BuildRequires:  cmake 
+BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
@@ -106,7 +108,7 @@
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
@@ -125,10 +127,10 @@
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
 
-%description 
+%description
 Binary Addons for Kodi Media Center
 
-%include %{SOURCE1} 
+%include %{SOURCE1}
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
@@ -138,11 +140,11 @@
 %endif
 
 pushd project/cmake/addons
-tar xvf %{SOURCE3} 
+tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires 
+#remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
 tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
@@ -160,14 +162,16 @@
     -DNEED_SUDO=FALSE \
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} 
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
 %if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
-  #patch -p0 < %{PATCH3}
+  #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
   patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  patch -up0 --verbose < %{PATCH5}
+  patch -up4 --verbose < %{PATCH6}
 %endif
 
 # fake buildtime in audiodecoder.qsf
@@ -180,7 +184,7 @@
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
-make VERBOSE=1 %{?_smp_mflags} 
+make VERBOSE=1 %{?_smp_mflags}
 popd
 
 %install
@@ -194,6 +198,6 @@
 %dir %{_datadir}/kodi
 %{_libdir}/kodi/PrepareEnv.cmake
 
-%include %{SOURCE2} 
+%include %{SOURCE2}
 
 %changelog

kodi.binary-addons-noX.spec Changed

@@ -58,11 +58,13 @@
 Patch3:         kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch
 # PATCH-PACKMAN kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch - fixes compiling of screensavers.rsxs with gcc > 4.8, suse_version >= 1320
 Patch4:         kodi.binary-addons-screensavers.rsxs-upstream-stdbool_h.patch
+Patch5:         lib555-missing-xlocale.patch
+Patch6:         pvr.stalker-gcc7.patch
 
-BuildRequires:  autoconf 
+BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  ccache
-BuildRequires:  cmake 
+BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
@@ -106,7 +108,7 @@
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGLESv2-devel
 %else
-%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2" 
+%if %{kodi_platform} == "raspberry-pi" || %{kodi_platform} == "raspberry-pi2"
 BuildRequires:  raspberrypi-userland-devel
 %endif
 %endif
@@ -125,10 +127,10 @@
 Requires:       kodi = %{version}
 #Requires:       libjsoncpp1
 
-%description 
+%description
 Binary Addons for Kodi Media Center
 
-%include %{SOURCE1} 
+%include %{SOURCE1}
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
@@ -138,11 +140,11 @@
 %endif
 
 pushd project/cmake/addons
-tar xvf %{SOURCE3} 
+tar xvf %{SOURCE3}
 mkdir -pv build/bootstrap/binary-addons/src
 cp -v %{SOURCE4} build/bootstrap/binary-addons/src
 
-#remove deps that are already installed using BuildRequires 
+#remove deps that are already installed using BuildRequires
 rm -rf depends/common/{p8-platform,tinyxml}
 rm -f  depends/common/kodi-platform/deps.txt
 tar xf %{SOURCE5} --strip-components=1 -C depends/common/kodi-platform
@@ -160,14 +162,16 @@
     -DNEED_SUDO=FALSE \
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} 
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix}
 
 # Tumbleweed and Factory have GCC 5.x ATM (20160309), source needs patching for this
 %if 0%{?suse_version} > 1320
   # patch audiodecoders.ncsf
-  #patch -p0 < %{PATCH3}
+  #patch -p0 < %%{PATCH3}
   # patch screensavers.rsxs
   patch screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %{PATCH4}
+  patch -up0 --verbose < %{PATCH5}
+  patch -up4 --verbose < %{PATCH6}
 %endif
 
 # fake buildtime in audiodecoder.qsf
@@ -180,7 +184,7 @@
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
-make VERBOSE=1 %{?_smp_mflags} 
+make VERBOSE=1 %{?_smp_mflags}
 popd
 
 %install
@@ -194,6 +198,6 @@
 %dir %{_datadir}/kodi
 %{_libdir}/kodi/PrepareEnv.cmake
 
-%include %{SOURCE2} 
+%include %{SOURCE2}
 
 %changelog

Changes of Revision 23