From https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5 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
path: root/gnu/packages/java-compression.scm
AgeCommit message (Collapse)Author
2021-07-12gnu: java-xz: Update to 1.9.Efraim Flashner
* gnu/packages/java-compression.scm (java-xz): Update to 1.9. [arguments]: Build with openjdk9.
2021-07-11gnu: java-xz: Mark source as zipbomb.Efraim Flashner
* gnu/packages/java-compression.scm (java-xz)[source]: Download source as zipbomb. [argments]: Remove custom 'chdir phase.
2021-02-27gnu: java-snappy: Fix checks when build machine has too much memory.Björn Höfling
* gnu/packages/java-compression.scm (java-snappy)[arguments]: Add set-test-memory-size phase. This fixes <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46780>. Thanks to zimoun for the solving idea. The CachingBufferPoolTest tries to allocate a lot of memory (20GB) and the test succeeds if there is not enough memory available in the JVM. When the build machine has a lot of memory (which is the case on the Guix CI system), the JVM will use more than 20GB as maximum heap size. In consequence, the test fails. The new phase adds a maxmemory size of 2G for the tests. Thus all other tests will have enough memory and the CachingBufferPoolTest will fail.
2020-08-19gnu: java-snappy: Update to 1.1.7.5.Tobias Geerinckx-Rice
* gnu/packages/java-compression.scm (java-snappy): Update to 1.1.7.5.
2020-07-17gnu: maven: Install from pom file.Julien Lepiller
* gnu/packages/java.scm (java-plexus-container-default-bootstrap) (java-plexus-component-annotations, java-plexus-cipher, java-asm) (java-jsr250, java-commons-cli, java-slf4j-api, java-slf4j-simple) (java-bsh, java-jboss-el-api-spec, java-jboss-interceptors-api-spec) (java-cdi-api, java-eclipse-sisu-plexus): Install from pom file. * gnu/packages/maven.scm (maven-resolver-api, maven-resolver-spi) (maven-resolver-util, maven-resolver-connector-basic, maven-resolver-impl) (java-plexus-utils, maven-artifact, maven-model, maven-builder-support) (maven-settings, maven-settings-builder, maven-model-builder) (maven-repository-metadata, maven-resolver-provider, maven-plugin-api) (maven-core, maven-embedder, maven-compat): Install from pom file.
2020-07-17gnu: java-plexus-archiver: Update to 4.2.2.Julien Lepiller
* gnu/packages/java.scm (java-plexus-archiver): Update to 4.2.2. (java-plexus-container-default, java-commons-compress) (java-geronimo-xbean-reflect): Install from pom file. (java-guava): Install from pom [source]: Use git source instead of generated source jar. * gnu/packages/java-compression.scm (java-xz, java-iq80-snappy): Install from pom.