Request 5612 (accepted)

Overview

Request 5612 (accepted)

- Apply upstream patch to fix "formatting of non-void pointers is
disallowed" on Tumbleweed caused by libfmt9; taken from
https://github.com/xbmc/xbmc/commit/1d4e27aaa64c317b0020bbd68bb6520d507bb48e
and
https://github.com/xbmc/xbmc/commit/0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6

Created by manfred.h over 1 year ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:manfred.h / kodi to package Multimedia / kodi

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

kodi-noX-raspberry-pi2.spec Changed

kodi-noX.spec Changed

kodi.spec Changed

fix-formattable-string.patch Added

@@ -0,0 +1,53 @@
+diff -up ./xbmc/utils/GLUtils.cpp.orig ./xbmc/utils/GLUtils.cpp
+--- ./xbmc/utils/GLUtils.cpp.orig	2022-03-02 19:38:51.000000000 +0100
++++ ./xbmc/utils/GLUtils.cpp	2022-10-16 11:17:54.313107565 +0200
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile,
+ 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
+diff -up ./xbmc/windowing/X11/WinSystemX11.cpp.orig ./xbmc/windowing/X11/WinSystemX11.cpp
+--- ./xbmc/windowing/X11/WinSystemX11.cpp.orig	2022-03-02 19:38:51.000000000 +0100
++++ ./xbmc/windowing/X11/WinSystemX11.cpp	2022-10-16 10:48:41.725732897 +0200
+--- ./xbmc/windowing/X11/WinSystemX11.cpp.orig	2022-10-16 11:49:10.137083194 +0200
++++ ./xbmc/windowing/X11/WinSystemX11.cpp	2022-10-16 11:50:09.065073269 +0200
+@@ -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", s);
+   }
+   else
+     CLog::Log(LOGDEBUG,"Window Manager Name: ");

Build Results
RPM Lint

Refresh

Comments for request 5612 2

manfred.h wrote over 1 year ago

Tested using a package built locally using "osc build".

sagiben wrote over 1 year ago

Request History

manfred.h created request over 1 year ago

manfred.h accepted request over 1 year ago

accepted