diff options
| author | Frank H <58829855+howie-f@users.noreply.github.com> | 2022-10-02 05:25:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 05:25:04 +0200 |
| commit | a8429610f28192fae74311eca615b6ebaa60ff7d (patch) | |
| tree | 34b5b4afa649db725476fafe342a8f5246ea0f9e | |
| parent | d2e5ac7db64c122cc555600c983cecbe9d6e83f3 (diff) | |
| parent | 651c82853fe69dc5aa3e6a50f2eb2f752caafba0 (diff) | |
| download | xbmc-a8429610f28192fae74311eca615b6ebaa60ff7d.tar.xz | |
Merge pull request #21674 from howie-f/v19-libfmt9
[backport] GLUtils/WinSystemX11: support building with libfmt 9.0.0
| -rw-r--r-- | xbmc/utils/GLUtils.cpp | 10 | ||||
| -rw-r--r-- | xbmc/windowing/X11/WinSystemX11.cpp | 5 |
2 files changed, 9 insertions, 6 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 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: "); |