mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
kodi: update to 20.0rc2-Nexus
- updated Mesa 22.3.y patch to upstream PR
This commit is contained in:
parent
05a522b8b4
commit
64dd8ada0f
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="kodi"
|
PKG_NAME="kodi"
|
||||||
PKG_VERSION="20.0rc1-Nexus"
|
PKG_VERSION="20.0rc2-Nexus"
|
||||||
PKG_SHA256="0f354516c9b02b0c1dab5f085865fd0dc3db5d759292db34a77c8977f1f76c4b"
|
PKG_SHA256="4b8081d41dd7a5d9a5e4a0a32e0ce825a47bbf57515c6273fba379f91f35221e"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.kodi.tv"
|
PKG_SITE="http://www.kodi.tv"
|
||||||
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
|
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
--- xbmc/xbmc/windowing/X11/GLContextEGL.h
|
|
||||||
+++ xbmc/xbmc/windowing/X11/GLContextEGL.h
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
#include "threads/CriticalSection.h"
|
|
||||||
|
|
||||||
#include <EGL/eglext.h>
|
|
||||||
-#include <EGL/eglextchromium.h>
|
|
||||||
+#include <EGL/eglext_angle.h>
|
|
||||||
#include <X11/Xutil.h>
|
|
||||||
|
|
||||||
class CGLContextEGL : public CGLContext
|
|
||||||
|
|
@ -0,0 +1,54 @@
|
|||||||
|
From b81d28d5ce679da2ff5f14dca691665551d30351 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alan Swanson <reiver@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@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
|
Loading…
x
Reference in New Issue
Block a user