NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/kodi: fix build with fmt >= 9.x

Browse Source 
For details see https://github.com/xbmc/xbmc/pull/21674

Build-tested using this previously broken defconfig:

BR2_x86_64=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_KODI=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_ONLY=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2022-10-02 16:46:29 +02:00 committed by Peter Korsgaard
parent 8aa68a529e
commit 61bdd02e93
2 changed files with 87 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
package/kodi/0005-GLUtils-cast-as-char-as-formatting-of-non-void-point.patch Normal file
View File

@ -0,0 +1,54 @@
From 44b30c116682968bacf8aec566fc9c193026ecc9 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 6 Jul 2022 22:48:35 +1000
Subject: [PATCH] GLUtils: cast as char as formatting of non-void pointers
is disallowed
Downloaded from upstream commit:
https://github.com/xbmc/xbmc/commit/44b30c116682968bacf8aec566fc9c193026ecc9
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
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 1ef804709f..c36dcf6a20 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
--
2.30.2

33
package/kodi/0006-WinSystemX11-cast-as-char-as-formatting-of-non-void-.patch Normal file
View File

@ -0,0 +1,33 @@
From 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 11 Jul 2022 09:39:02 +0000
Subject: [PATCH] WinSystemX11: cast as char as formatting of non-void
pointers is disallowed
Downloaded from upstream commit:
https://github.com/xbmc/xbmc/commit/651c82853fe69dc5aa3e6a50f2eb2f752caafba0
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
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 8a18288fd8..033c0f77bf 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: ");
--
2.30.2