Request 2530 (accepted)

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.changes Changed

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

@@ -54,6 +54,10 @@
 Source5:        kodi-platform-15edaf7.tar.gz
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
+# PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
+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
 
 BuildRequires:  autoconf 
 BuildRequires:  automake
@@ -62,7 +66,11 @@
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
+%if %{noX_build}
+BuildRequires:  kodi-noX-devel
+%else
 BuildRequires:  kodi-devel
+%endif
 BuildRequires:  tinyxml-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
@@ -112,7 +120,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
-Requires:       libjsoncpp1
+#Requires:       libjsoncpp1
 
 %description 
 Binary Addons for Kodi Media Center
@@ -150,6 +158,25 @@
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
     -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 -s -p0 < %PATCH3
+  # patch screensavers.rsxs
+  patch -s screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %PATCH4
+%endif
+
+# fake buildtime in audiodecoder.qsf
+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')
+for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+
 make VERBOSE=1 %{?_smp_mflags}
 popd

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

@@ -54,6 +54,10 @@
 Source5:        kodi-platform-15edaf7.tar.gz
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
+# PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
+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
 
 BuildRequires:  autoconf 
 BuildRequires:  automake
@@ -62,7 +66,11 @@
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
+%if %{noX_build}
+BuildRequires:  kodi-noX-devel
+%else
 BuildRequires:  kodi-devel
+%endif
 BuildRequires:  tinyxml-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
@@ -112,7 +120,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
-Requires:       libjsoncpp1
+#Requires:       libjsoncpp1
 
 %description 
 Binary Addons for Kodi Media Center
@@ -150,6 +158,25 @@
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
     -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 -s -p0 < %PATCH3
+  # patch screensavers.rsxs
+  patch -s screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %PATCH4
+%endif
+
+# fake buildtime in audiodecoder.qsf
+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')
+for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+
 make VERBOSE=1 %{?_smp_mflags}
 popd

kodi.binary-addons-noX.spec Changed

@@ -54,6 +54,10 @@
 Source5:        kodi-platform-15edaf7.tar.gz
 Patch1:         cmake-binary-addons.patch
 Patch2:         addon-helpers_lib64.patch
+# PATCH-PACKMAN kodi.binary-addons-audiodecoder.ncsf-gcc5.3.patch - fixes compiling of audiodecoder.ncsf with gcc > 4.8, suse_version >= 1320
+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
 
 BuildRequires:  autoconf 
 BuildRequires:  automake
@@ -62,7 +66,11 @@
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  jsoncpp-devel
+%if %{noX_build}
+BuildRequires:  kodi-noX-devel
+%else
 BuildRequires:  kodi-devel
+%endif
 BuildRequires:  tinyxml-devel
 BuildRequires:  libmp3lame-devel
 BuildRequires:  libSOIL-devel
@@ -112,7 +120,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    ppc64
 Requires:       kodi = %{version}
-Requires:       libjsoncpp1
+#Requires:       libjsoncpp1
 
 %description 
 Binary Addons for Kodi Media Center
@@ -150,6 +158,25 @@
     -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
     -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
     -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 -s -p0 < %PATCH3
+  # patch screensavers.rsxs
+  patch -s screensavers.rsxs/lib/rsxs-1.0/lib/stdbool.in.h %PATCH4
+%endif
+
+# fake buildtime in audiodecoder.qsf
+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')
+for file in audiodecoder.qsf/lib/Highly_Quixotic/Core/qsound.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/Starscream/star.c \
+            audiodecoder.ssf/lib/Highly_Theoretical/Core/sega.c \
+            audiodecoder.timidity/lib/timidity/timidity/speex_a.c; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+
 make VERBOSE=1 %{?_smp_mflags}
 popd

kodi.binary-addons.spec Changed

Overview

Request 2530 (accepted)

Request History