Request 5650 (accepted)

Overview

Request 5650 (accepted)

- Apply upstream patch as "fix_import_eglextchromium.patch" to fix
compilation failure "EGL/eglextchromium.h: No such file or directory"
with recent Mesa versions on TW; taken from
https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5

Created by manfred.h over 1 year ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:manfred.h / kodi to package Multimedia / kodi

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

kodi-noX-raspberry-pi2.spec Changed

kodi-noX.spec Changed

kodi.spec Changed

fix_import_eglextchromium.patch Added

@@ -0,0 +1,38 @@
+diff -rup xbmc-19.5-Matrix.orig/cmake/modules/FindEGL.cmake xbmc-19.5-Matrix/cmake/modules/FindEGL.cmake
+--- xbmc-19.5-Matrix.orig/cmake/modules/FindEGL.cmake	2022-12-24 10:29:16.000000000 +0100
++++ xbmc-19.5-Matrix/cmake/modules/FindEGL.cmake	2023-01-02 10:03:58.893374532 +0100
+@@ -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 -rup xbmc-19.5-Matrix.orig/xbmc/windowing/X11/GLContextEGL.h xbmc-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h
+--- xbmc-19.5-Matrix.orig/xbmc/windowing/X11/GLContextEGL.h	2022-12-24 10:29:16.000000000 +0100
++++ xbmc-19.5-Matrix/xbmc/windowing/X11/GLContextEGL.h	2023-01-02 10:04:44.765337785 +0100
+@@ -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

Build Results
RPM Lint

Refresh

Comments for request 5650 0

Request History

manfred.h created request over 1 year ago

manfred.h accepted request over 1 year ago