rpms/kodi/devel kodi-14.0-gcc5.patch,NONE,1.1 kodi.spec,1.4,1.5

[Michael Cronenworth]

Author: mooninite

Update of /cvs/free/rpms/kodi/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17027

Modified Files:
	kodi.spec 
Added Files:
	kodi-14.0-gcc5.patch 
Log Message:
* Fri May 22 2015 Michael Cronenworth <mike at cchtml.com> - 14.2-2
- GCC5 fixes


kodi-14.0-gcc5.patch:
 argp-fmtstream.h |    4 ----
 argp.h           |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE kodi-14.0-gcc5.patch ---
--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig	2015-03-26 13:25:20.000000000 -0500
+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h	2015-05-19 16:05:20.992493851 -0500
@@ -559,7 +559,7 @@
 # endif
 
 # ifndef ARGP_EI
-#  define ARGP_EI extern __inline__
+#  define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) 
 # endif
 
 ARGP_EI void
--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig	2015-03-26 13:25:20.000000000 -0500
+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h	2015-05-19 16:02:25.775456866 -0500
@@ -198,11 +198,7 @@
 #endif
 
 #ifndef ARGP_FS_EI
-#ifdef __clang__
 #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
-#else
-#define ARGP_FS_EI extern inline
-#endif
 #endif
 
 ARGP_FS_EI size_t


Index: kodi.spec
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kodi.spec	29 Mar 2015 06:05:13 -0000	1.4
+++ kodi.spec	22 May 2015 16:18:00 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name: kodi
 Version: 14.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -41,6 +41,9 @@
 # Remove call to internal ffmpeg function (misued anyway)
 Patch5: kodi-14.0-dvddemux-ffmpeg.patch
 
+# GCC5 inline changes
+Patch6: kodi-14.0-gcc5.patch
+
 # Kodi is the renamed XBMC project
 Obsoletes: xbmc < 14.0-1
 Provides: xbmc = %{version}
@@ -253,6 +256,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p0
+%patch6 -p1
 
 %if 0%{?_with_hdhomerun}
 %else
@@ -424,6 +428,9 @@
 
 
 %changelog
+* Fri May 22 2015 Michael Cronenworth <mike at cchtml.com> - 14.2-2
+- GCC5 fixes
+
 * Sun Mar 29 2015 Michael Cronenworth <mike at cchtml.com> - 14.2-1
 - Update to 14.2 final
 - Build with SDL2 to enable joystick support