Skip to content

Commit

Permalink
temp coreelec kodi fix
Browse files Browse the repository at this point in the history
  • Loading branch information
rellla committed Aug 6, 2022
1 parent 434453c commit 208cda4
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6 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

---
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: {}", data);
+ const char* s;
+
+ s = reinterpret_cast<const char*>(data);
+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
}
else
CLog::Log(LOGDEBUG,"Window Manager Name: ");
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
From 1d4e27aaa64c317b0020bbd68bb6520d507bb48e 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

---
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);
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);
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);
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);
else

0 comments on commit 208cda4

Please sign in to comment.