From 33cf3a912e6c6cedf17e80ac094d1ceb8a207c51 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 30 May 2023 22:16:18 +0200 Subject: [PATCH] kodi: fix build with mesa 22.3 --- srcpkgs/kodi/patches/mesa-22.3.patch | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 srcpkgs/kodi/patches/mesa-22.3.patch diff --git a/srcpkgs/kodi/patches/mesa-22.3.patch b/srcpkgs/kodi/patches/mesa-22.3.patch new file mode 100644 index 00000000000..f95aab7750b --- /dev/null +++ b/srcpkgs/kodi/patches/mesa-22.3.patch @@ -0,0 +1,54 @@ +From 5449652abf0bb9dddd0d796de4120e60f19f89a5 Mon Sep 17 00:00:00 2001 +From: Alan Swanson +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 +--- + 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..a68a8db901222 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 ++#ifdef HAVE_EGLEXTANGLE ++#include ++#else + #include ++#endif + #include + + class CGLContextEGL : public CGLContext