diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-08-26 01:19:55 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-26 01:22:47 -0400 |
| commit | 6cb9d45a40954976452a12d0e440a415e5e28171 (patch) | |
| tree | f25912ba9c160b554987cfbce449fe381ccf5d74 | |
| parent | sys-boot/refind: substitute with final ebuild, rm bogus file (diff) | |
| download | gentoo-6cb9d45a40954976452a12d0e440a415e5e28171.tar.gz gentoo-6cb9d45a40954976452a12d0e440a415e5e28171.tar.bz2 gentoo-6cb9d45a40954976452a12d0e440a415e5e28171.zip | |
media-tv/kodi: fix from upstream for building w/gcc-5 #557300
| -rw-r--r-- | media-tv/kodi/files/kodi-14.1-gcc-5.patch | 47 | ||||
| -rw-r--r-- | media-tv/kodi/kodi-14.1.ebuild | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/media-tv/kodi/files/kodi-14.1-gcc-5.patch b/media-tv/kodi/files/kodi-14.1-gcc-5.patch new file mode 100644 index 000000000000..5134ea1e10bd --- /dev/null +++ b/media-tv/kodi/files/kodi-14.1-gcc-5.patch @@ -0,0 +1,47 @@ +https://bugs.gentoo.org/557300 + +fix from upstream + +From 2d792707c7ad60c598616183bd1e7c41382961c3 Mon Sep 17 00:00:00 2001 +From: Michael Cronenworth <mike@cchtml.com> +Date: Tue, 19 May 2015 16:43:36 -0500 +Subject: [PATCH] Always declare gnu89 inline standard + +GCC5 switches the minimum inline standard requirements from gnu89 to gnu11. +--- + xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h | 4 ---- + xbmc/screensavers/rsxs-0.9/lib/argp.h | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h +index ff4f575..92eda3b 100644 +--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h ++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h +@@ -198,11 +198,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + #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 +diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp.h b/xbmc/screensavers/rsxs-0.9/lib/argp.h +index ae7fa04..c83c75e 100644 +--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h ++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h +@@ -559,7 +559,7 @@ extern void *__argp_input (const struct argp *__restrict __argp, + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) + # endif + + ARGP_EI void +-- +2.4.4 + diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild index 1fcd3917fbca..7740ec6725ab 100644 --- a/media-tv/kodi/kodi-14.1.ebuild +++ b/media-tv/kodi/kodi-14.1.ebuild @@ -153,6 +153,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617 epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36 + epatch "${FILESDIR}"/${P}-gcc-5.patch #557300 # The mythtv patch touches configure.ac, so force a regen rm -f configure |