Request 3982 (accepted)

Overview

Request 3982 (accepted)

Fix build with new glibc and gcc7

Created by davepl over 6 years ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi.binary-addons

Submit package home:davepl / kodi.binary-addons to package Multimedia / kodi.binary-addons

kodi.binary-addons.changes Changed

kodi.binary-addons.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

addon-helpers_lib64.patch Changed

lib555-missing-xlocale.patch Added

@@ -0,0 +1,32 @@
+From: Dave Plater <davejplater@gmail.com
+Date: 2017-09-29 11:17:22 +0200
+Subject: input: Fix kodi.binary-addons xlocale.h issue
+References: Packman Mailing list
+
+Patch Locale.hh to not include xlocale.h which is long
+depreciated and only used in apple.
+
+Index: project/cmake/addons/build/pvr.mediaportal.tvserver/src/lib/live555/liveMedia/include/Locale.hh
+===================================================================
+--- pvr.mediaportal.tvserver/src/lib/live555/liveMedia/include/Locale.hh.orig	2017-09-29 11:13:15.976289827 +0200
++++ pvr.mediaportal.tvserver/src/lib/live555/liveMedia/include/Locale.hh	2017-09-29 12:23:38.960166506 +0200
+@@ -33,8 +33,8 @@ along with this library; if not, write t
+ // then you can override this by defining "XLOCALE_USED" before #including this file.
+ 
+ #ifdef XLOCALE_USED
+-#undef LOCALE_NOT_USED
+-#undef XLOCALE_NOT_USED
++#undef XLOCALE_USED
++#define XLOCALE_NOT_USED 1
+ #else
+ #if defined(__WIN32__) || defined(_WIN32)
+ #define XLOCALE_NOT_USED 1
+@@ -44,7 +44,7 @@ along with this library; if not, write t
+ #ifndef LOCALE_NOT_USED
+ #include <locale.h>
+ #ifndef XLOCALE_NOT_USED
+-#include <xlocale.h> // because, on some systems, <locale.h> doesn't include <xlocale.h>; this makes sure that we get both
++#include <locale.h> // because, on some systems, <locale.h> doesn't include <locale.h>; this makes sure that we get both
+ #endif
+ #endif
+

pvr.stalker-gcc7.patch Added

@@ -0,0 +1,32 @@
+From: Dave Plater <davejplater@gmail.com
+Date: 2017-09-29 12:14:22 +0200
+Subject: input: Fix kodi.binary-addons gcc7 issues
+References: Packman Mailing list
+
+pvr.stalker error: 'std::function' has not been declared
+
+Index: project/cmake/addons/build/pvr.stalker/src/CWatchdog.h
+===================================================================
+--- project/cmake/addons/build/pvr.stalker/src/CWatchdog.h.orig	2017-09-29 11:13:15.908288018 +0200
++++ project/cmake/addons/build/pvr.stalker/src/CWatchdog.h	2017-10-02 12:20:36.972629158 +0200
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <thread>
++#include <functional>
+ 
+ #include "SAPI.h"
+ 
+Index: project/cmake/addons/build/pvr.stalker/src/SData.h
+===================================================================
+--- project/cmake/addons/build/pvr.stalker/src/SData.h.orig	2017-09-29 12:22:17.101337713 +0200
++++ project/cmake/addons/build/pvr.stalker/src/SData.h	2017-09-29 12:44:52.219450517 +0200
+@@ -23,6 +23,8 @@
+ 
+ #include <thread>
+ #include <vector>
++#include <functional>
++#include <iostream>
+ 
+ #include <json/json.h>
+ #include <p8-platform/threads/mutex.h>

Build Results
RPM Lint

Refresh

Comments for request 3982 0

Request History

davepl created request over 6 years ago

Fix build with new glibc and gcc7

olh accepted request over 6 years ago