package/kodi: bump version to 19.5-Matrix
Removed two upstream patches included in this version. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
Thomas Petazzoni
parent
1df9d42bdd
commit
95a16926ed
@ -6,7 +6,7 @@
|
||||
|
||||
# Not possible to directly refer to kodi variables, because of
|
||||
# first/second expansion trickery...
|
||||
KODI_JSONSCHEMABUILDER_VERSION = 19.4-Matrix
|
||||
KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix
|
||||
KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
|
||||
KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
|
||||
KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
# Not possible to directly refer to kodi variables, because of
|
||||
# first/second expansion trickery...
|
||||
KODI_TEXTUREPACKER_VERSION = 19.4-Matrix
|
||||
KODI_TEXTUREPACKER_VERSION = 19.5-Matrix
|
||||
KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
|
||||
KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
|
||||
KODI_TEXTUREPACKER_DL_SUBDIR = kodi
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da kodi-19.4-Matrix.tar.gz
|
||||
sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-Matrix.tar.gz
|
||||
sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz
|
||||
sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
|
||||
sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
# When updating the version, please also update kodi-jsonschemabuilder
|
||||
# and kodi-texturepacker
|
||||
KODI_VERSION_MAJOR = 19.4
|
||||
KODI_VERSION_MAJOR = 19.5
|
||||
KODI_VERSION_NAME = Matrix
|
||||
KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME)
|
||||
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user