diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index b670ebd156..cf14fa520f 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="20.0rc2-Nexus" -PKG_SHA256="4b8081d41dd7a5d9a5e4a0a32e0ce825a47bbf57515c6273fba379f91f35221e" +PKG_VERSION="20.0-Nexus" +PKG_SHA256="4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/mediacenter/kodi/patches/kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch b/packages/mediacenter/kodi/patches/kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch deleted file mode 100644 index f3bc857ab5..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.01-PR22291-fix-mesa-22.3.0-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b81d28d5ce679da2ff5f14dca691665551d30351 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..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 -+#ifdef HAVE_EGLEXTANGLE -+#include -+#else - #include -+#endif - #include - - class CGLContextEGL : public CGLContext