diff options
| author | Michael Cronenworth <mike@cchtml.com> | 2015-05-22 16:07:14 -0500 |
|---|---|---|
| committer | Michael Cronenworth <mike@cchtml.com> | 2015-05-22 16:07:14 -0500 |
| commit | 3e049a06bd2e2ca9858a3bab12b7947578c8e3a7 (patch) | |
| tree | eb31f943322c23e5aa4f3d4b0d4b5806498e9776 | |
| parent | 31992f517fa2a416683485fd6ec03d0851657249 (diff) | |
| download | xbmc-rpm-3e049a06bd2e2ca9858a3bab12b7947578c8e3a7.tar.gz xbmc-rpm-3e049a06bd2e2ca9858a3bab12b7947578c8e3a7.tar.xz xbmc-rpm-3e049a06bd2e2ca9858a3bab12b7947578c8e3a7.zip | |
Apply patch for GCC5 compile error
| -rw-r--r-- | kodi-14.0-gcc5.patch | 25 | ||||
| -rw-r--r-- | kodi.spec | 9 |
2 files changed, 33 insertions, 1 deletions
diff --git a/kodi-14.0-gcc5.patch b/kodi-14.0-gcc5.patch new file mode 100644 index 0000000..e4c1e52 --- /dev/null +++ b/kodi-14.0-gcc5.patch @@ -0,0 +1,25 @@ +--- 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 @@ -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 @@ Patch4: kodi-14.0-versioning.patch # 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 @@ library. %patch3 -p1 %patch4 -p1 %patch5 -p0 +%patch6 -p1 %if 0%{?_with_hdhomerun} %else @@ -424,6 +428,9 @@ fi %changelog +* Fri May 22 2015 Michael Cronenworth <mike@cchtml.com> - 14.2-2 +- GCC5 fixes + * Sun Mar 29 2015 Michael Cronenworth <mike@cchtml.com> - 14.2-1 - Update to 14.2 final - Build with SDL2 to enable joystick support |