summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2018-11-28 11:33:06 -0500
committerCraig Andrews <candrews@gentoo.org>2018-11-28 11:33:20 -0500
commit66a13dddf37fcbd9d7fb66b6f2fb4972251bec38 (patch)
tree6ce3f51e115cd2324a1f87bb2556eb879d2288a5 /media-tv/kodi
parentnet-misc/ntpclient: drop old version (diff)
downloadgentoo-66a13dddf37fcbd9d7fb66b6f2fb4972251bec38.tar.gz
gentoo-66a13dddf37fcbd9d7fb66b6f2fb4972251bec38.tar.bz2
gentoo-66a13dddf37fcbd9d7fb66b6f2fb4972251bec38.zip
media-tv/kodi: Fix compilation error due to use of ancient _G_ types
Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'media-tv/kodi')
-rw-r--r--media-tv/kodi/files/kodi-17.6-wrapper.patch39
-rw-r--r--media-tv/kodi/kodi-17.6-r9.ebuild1
2 files changed, 40 insertions, 0 deletions
diff --git a/media-tv/kodi/files/kodi-17.6-wrapper.patch b/media-tv/kodi/files/kodi-17.6-wrapper.patch
new file mode 100644
index 000000000000..dc3e9887da94
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.6-wrapper.patch
@@ -0,0 +1,39 @@
+From bbc7a53911f1ef8a4a24b76d88c5b0e5899e082f Mon Sep 17 00:00:00 2001
+From: Michael Cronenworth <mike@cchtml.com>
+Date: Fri, 16 Mar 2018 13:48:34 -0500
+Subject: [PATCH] DllLoader: Update variable to use standard va_list type
+
+The _G_ types were ancient, internal-only types defined in _G_config.h
+and are now deprecated.
+
+https://sourceware.org/ml/libc-announce/2018/msg00000.html
+https://sourceware.org/git/?p=glibc.git;a=commit;h=48a8f8328122ab8d06b7333cb87be46feeaf7cca
+
+Signed-off-by: Michael Cronenworth <mike@cchtml.com>
+---
+ xbmc/cores/DllLoader/exports/wrapper.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/xbmc/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c
+index 1980bfe65cac..7c7d4ac6131d 100644
+--- a/xbmc/cores/DllLoader/exports/wrapper.c
++++ b/xbmc/cores/DllLoader/exports/wrapper.c
+@@ -45,9 +45,6 @@ typedef int64_t off64_t;
+ typedef off64_t __off64_t;
+ typedef fpos_t fpos64_t;
+ #define stat64 stat
+-#if defined(TARGET_DARWIN) || defined(TARGET_ANDROID)
+-#define _G_va_list va_list
+-#endif
+ #endif
+
+ #ifdef TARGET_POSIX
+@@ -485,7 +482,7 @@ int __wrap___printf_chk(int flag, const char *format, ...)
+ return res;
+ }
+
+-int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, _G_va_list ap)
++int __wrap___vfprintf_chk(FILE* stream, int flag, const char *format, va_list ap)
+ {
+ return dll_vfprintf(stream, format, ap);
+ }
diff --git a/media-tv/kodi/kodi-17.6-r9.ebuild b/media-tv/kodi/kodi-17.6-r9.ebuild
index 0df46272fb8f..08e9b06a101c 100644
--- a/media-tv/kodi/kodi-17.6-r9.ebuild
+++ b/media-tv/kodi/kodi-17.6-r9.ebuild
@@ -17,6 +17,7 @@ FFMPEG_KODI_VERSION="17.5"
CODENAME="Krypton"
PATCHES=(
"${FILESDIR}/${P}-nmblookup.patch"
+ "${FILESDIR}/${P}-wrapper.patch"
)
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz