[packages/kodi] backported upstream fix for libfmt 9

atler atler at pld-linux.org
Thu Sep 1 18:49:16 CEST 2022


commit 412c8c6f702bf02ef700de15cc6fc487072110c8
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Sep 1 18:49:00 2022 +0200

    backported upstream fix for libfmt 9

 kodi.spec     |  2 ++
 libfmt9.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
---
diff --git a/kodi.spec b/kodi.spec
index 9b3bcbb..9d5121e 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -55,6 +55,7 @@ Source0:	https://github.com/xbmc/xbmc/archive/%{version}-%{codename}.tar.gz
 # Source0-md5:	a668854505eff3ca5ed9f33e3ac91c80
 Patch0:		disable-static.patch
 Patch1:		libdvd.patch
+Patch2:		libfmt9.patch
 URL:		https://kodi.tv/
 BuildRequires:	EGL-devel
 %{?with_gbm:BuildRequires:	Mesa-libgbm-devel}
@@ -210,6 +211,7 @@ Header files for Kodi.
 %setup -q -n xbmc-%{version}%{?subver}-%{codename}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} -r lib/win32
 
diff --git a/libfmt9.patch b/libfmt9.patch
new file mode 100644
index 0000000..2910c74
--- /dev/null
+++ b/libfmt9.patch
@@ -0,0 +1,74 @@
+From 1d4e27aaa64c317b0020bbd68bb6520d507bb48e Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi at 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 c6ddcc077172f..df8921e2b00c1 100644
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -149,27 +149,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 0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi at 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 42f5a99faab94..cdb2a1da2e28b 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1048,7 +1048,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", s);
+   }
+   else
+     CLog::Log(LOGDEBUG,"Window Manager Name: ");
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/412c8c6f702bf02ef700de15cc6fc487072110c8



More information about the pld-cvs-commit mailing list