diff options
| -rw-r--r-- | multimedia/kodi/kodi-19.4-fmt-9.patch | 74 | ||||
| -rw-r--r-- | multimedia/kodi/kodi.SlackBuild | 7 |
2 files changed, 79 insertions, 2 deletions
diff --git a/multimedia/kodi/kodi-19.4-fmt-9.patch b/multimedia/kodi/kodi-19.4-fmt-9.patch new file mode 100644 index 0000000000..b60d9ccc93 --- /dev/null +++ b/multimedia/kodi/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/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 4adeffbe62..e810615f3c 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -29,7 +29,7 @@ PRGNAM=kodi SRCNAM=xbmc CODNAM=Matrix VERSION=${VERSION:-19.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -78,10 +78,13 @@ find -L . \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to fix compliation with newer fmt versions +# Thanks to gentoo for the patch and Steven Voges for the heads up +patch -p1 < $CWD/kodi-19.4-fmt-9.patch # Autodetection of "optional" dependencies sucks. It does not work and # compilation will fail on each of these if not explicitly disabled. -# Figured I'd mplemented my own autodetection instead of requiring +# Figured I'd implement my own autodetection instead of requiring # passing a bunch of annoying flags :) if pkg-config --exists avahi-core ; then AVAHI=ON; else AVAHI=OFF; fi if pkg-config --exists cwiid ; then CWIID=ON; else CWIID=OFF; fi |