[kodi] Fix fmt-9 build issue

commit ad7c9a10f27fbf01c01d2cb69c9d99a82eff6cbd Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Aug 7 15:25:07 2022 +0100 Fix fmt-9 build issue kodi-19-fmt-9.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ kodi.spec | 4 +++ 2 files changed, 78 insertions(+) --- diff --git a/kodi-19-fmt-9.patch b/kodi-19-fmt-9.patch new file mode 100644 index 0000000..b60d9cc --- /dev/null +++ b/kodi-19-fmt-9.patch @@ -0,0 +1,74 @@ +From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum <rudi(a)heitbaum.com&gt; +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(a)heitbaum.com&gt; +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/kodi.spec b/kodi.spec index f3e6ff6..0f55163 100644 --- a/kodi.spec +++ b/kodi.spec @@ -94,6 +94,9 @@ Patch5: kodi-19-ffmpeg-4-4.patch # FFmpeg 4.4 fix for AC3 transcoding (RFBZ#6000) Patch6: kodi-19-ffmpeg-4-4-ac3.patch +# https://github.com/xbmc/xbmc/pull/21674 +Patch7: kodi-19-fmt-9.patch + %ifarch x86_64 i686 %global _with_crystalhd 1 %endif @@ -340,6 +343,7 @@ This package contains FirewallD files for Kodi. %patch4 -p1 -b.brp-mangle-shebangs %patch5 -p1 -b.ffmpeg-4-4 %patch6 -p1 -b.ffmpeg-4-4-ac3 +%patch7 -p1 -b.fmt-9 # Fix up Python shebangs pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \