diff options
author | Jory Pratt <anarchy@gentoo.org> | 2022-07-14 22:31:42 -0500 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2022-07-14 22:31:42 -0500 |
commit | 5d1add072ce93cd9570abc2cbe334d4e54955afe (patch) | |
tree | 202ca435f6dacd7ea4730740fb2e6ce93856824c /media-tv | |
parent | net-misc/spice-gtk: Fix build for musl users (diff) | |
download | musl-5d1add072ce93cd9570abc2cbe334d4e54955afe.tar.gz musl-5d1add072ce93cd9570abc2cbe334d4e54955afe.tar.bz2 musl-5d1add072ce93cd9570abc2cbe334d4e54955afe.zip |
media-tv/kodi: sync with ::gentoo
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/kodi/files/kodi-19.4-fmt-9.patch | 74 | ||||
-rw-r--r-- | media-tv/kodi/kodi-19.4-r2.ebuild (renamed from media-tv/kodi/kodi-19.4-r1.ebuild) | 1 |
2 files changed, 75 insertions, 0 deletions
diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch new file mode 100644 index 00000000..b60d9ccc --- /dev/null +++ b/media-tv/kodi/files/kodi-19.4-fmt-9.patch @@ -0,0 +1,74 @@ +From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Wed, 6 Jul 2022 22:48:35 +1000 +Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers + is disallowed + +--- + xbmc/utils/GLUtils.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp +index 1ef804709ff56..c36dcf6a20fec 100644 +--- a/xbmc/utils/GLUtils.cpp ++++ b/xbmc/utils/GLUtils.cpp +@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno) + void LogGraphicsInfo() + { + #if defined(HAS_GL) || defined(HAS_GLES) +- const GLubyte *s; ++ const char* s; + +- s = glGetString(GL_VENDOR); ++ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR)); + if (s) + CLog::Log(LOGINFO, "GL_VENDOR = %s", s); + else + CLog::Log(LOGINFO, "GL_VENDOR = NULL"); + +- s = glGetString(GL_RENDERER); ++ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER)); + if (s) + CLog::Log(LOGINFO, "GL_RENDERER = %s", s); + else + CLog::Log(LOGINFO, "GL_RENDERER = NULL"); + +- s = glGetString(GL_VERSION); ++ s = reinterpret_cast<const char*>(glGetString(GL_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_VERSION = %s", s); + else + CLog::Log(LOGINFO, "GL_VERSION = NULL"); + +- s = glGetString(GL_SHADING_LANGUAGE_VERSION); ++ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)); + if (s) + CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s); + else + +From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi@heitbaum.com> +Date: Mon, 11 Jul 2022 09:39:02 +0000 +Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void + pointers is disallowed + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index 8a18288fd8af0..033c0f77bf454 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager() + + if(status == Success && items_read) + { +- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data); ++ const char* s; ++ ++ s = reinterpret_cast<const char*>(data); ++ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s); + } + else + CLog::Log(LOGDEBUG,"Window Manager Name: "); diff --git a/media-tv/kodi/kodi-19.4-r1.ebuild b/media-tv/kodi/kodi-19.4-r2.ebuild index c253a0cc..d1e91c8d 100644 --- a/media-tv/kodi/kodi-19.4-r1.ebuild +++ b/media-tv/kodi/kodi-19.4-r2.ebuild @@ -191,6 +191,7 @@ Please consider enabling IP_MULTICAST under Networking options. " PATCHES=( + "${FILESDIR}/${P}-fmt-9.patch" "${FILESDIR}/musl/19.0/0001-add-missing-stdint.h.patch" "${FILESDIR}/musl/19.0/0002-fix-fileemu.patch" "${FILESDIR}/musl/19.0/0003-Use-stdint.h-defined-types-uint8_t-uint16_t-uint32_t.patch" |