[packages/kodi] up to 19.5
atler
atler at pld-linux.org
Sat Dec 24 13:15:29 CET 2022
commit 945b4c1375b0ec0e744fe97b4bcd89f4c864ff10
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Dec 24 13:14:22 2022 +0100
up to 19.5
- fix build with recent mesa versions (from:
https://github.com/xbmc/xbmc/pull/22291)
kodi.spec | 8 +++----
libfmt9.patch | 74 ----------------------------------------------------------
mesa22.3.patch | 54 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 78 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index b198276..711abeb 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -46,16 +46,16 @@
#define subver rc1
Summary: Kodi is a free and open source media-player and entertainment hub
Name: kodi
-Version: 19.4
-Release: 4
+Version: 19.5
+Release: 1
License: GPL v2+ and GPL v3+
Group: Applications/Multimedia
#Source0Download: https://github.com/xbmc/xbmc/releases
Source0: https://github.com/xbmc/xbmc/archive/%{version}-%{codename}.tar.gz
-# Source0-md5: a668854505eff3ca5ed9f33e3ac91c80
+# Source0-md5: 44f78712d1752af1c9c3d43dd5a56a17
Patch0: disable-static.patch
Patch1: libdvd.patch
-Patch2: libfmt9.patch
+Patch2: mesa22.3.patch
URL: https://kodi.tv/
BuildRequires: EGL-devel
%{?with_gbm:BuildRequires: Mesa-libgbm-devel}
diff --git a/libfmt9.patch b/libfmt9.patch
deleted file mode 100644
index 2910c74..0000000
--- a/libfmt9.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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: ");
diff --git a/mesa22.3.patch b/mesa22.3.patch
new file mode 100644
index 0000000..f3bc857
--- /dev/null
+++ b/mesa22.3.patch
@@ -0,0 +1,54 @@
+From b81d28d5ce679da2ff5f14dca691665551d30351 Mon Sep 17 00:00:00 2001
+From: Alan Swanson <reiver at improbability.net>
+Date: Mon, 19 Dec 2022 21:28:13 +0200
+Subject: [PATCH] Work around Mesa eglchromium.h removal
+
+I have polished Alan's snippet to buildable state and tested
+on Kodi from Debian sid.
+
+Signed-off-by: Vasyl Gello <vasek.gello at gmail.com>
+---
+ cmake/modules/FindEGL.cmake | 6 ++++++
+ xbmc/windowing/X11/GLContextEGL.h | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
+index b00fe08a25f95..f2648596cfa71 100644
+--- a/cmake/modules/FindEGL.cmake
++++ b/cmake/modules/FindEGL.cmake
+@@ -9,6 +9,7 @@
+ # EGL_INCLUDE_DIRS - the EGL include directory
+ # EGL_LIBRARIES - the EGL libraries
+ # EGL_DEFINITIONS - the EGL definitions
++# HAVE_EGLEXTANGLE - if eglext_angle.h exists else use eglextchromium.h
+ #
+ # and the following imported targets::
+ #
+@@ -35,6 +36,11 @@ if(EGL_FOUND)
+ set(EGL_LIBRARIES ${EGL_LIBRARY})
+ set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
+ set(EGL_DEFINITIONS -DHAS_EGL=1)
++ include(CheckIncludeFiles)
++ CHECK_INCLUDE_FILES("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
++ if(HAVE_EGLEXTANGLE)
++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1")
++ endif()
+
+ if(NOT TARGET EGL::EGL)
+ add_library(EGL::EGL UNKNOWN IMPORTED)
+diff --git a/xbmc/windowing/X11/GLContextEGL.h b/xbmc/windowing/X11/GLContextEGL.h
+index 99a6a9024e8c6..afea0b7c43eac 100644
+--- a/xbmc/windowing/X11/GLContextEGL.h
++++ b/xbmc/windowing/X11/GLContextEGL.h
+@@ -13,7 +13,11 @@
+ #include "threads/CriticalSection.h"
+
+ #include <EGL/eglext.h>
++#ifdef HAVE_EGLEXTANGLE
++#include <EGL/eglext_angle.h>
++#else
+ #include <EGL/eglextchromium.h>
++#endif
+ #include <X11/Xutil.h>
+
+ class CGLContextEGL : public CGLContext
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kodi.git/commitdiff/945b4c1375b0ec0e744fe97b4bcd89f4c864ff10
More information about the pld-cvs-commit
mailing list