[PATCH 0/6] Update kodi to 21.2

  • Open
  • quality assurance status badge
Details
One participant
  • André Batista
Owner
unassigned
Submitted by
André Batista
Severity
normal

Debbugs page

André Batista wrote 2 weeks ago
(address . guix-patches@gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225222459.3781-1-nandre@riseup.net
Hi Guix,

This patch series updates Kodi to version 21.2. In order to do so, it
was necessary to add libudfread and update crossguid, libdvd*/kodi,
besides the usual adjustments to the updated package definition.

Cheers!

André Batista (6):
gnu: Add libudfread.
gnu: crossguid: Update to ca1bf4b810e2d188d04cb6286f957008ee1b7681.
gnu: libdvdnav/kodi: Update to 6.1.1.
gnu: libdvdread/kodi: Update to 6.1.3.
gnu: libdvdcss/kodi: Update to 1.4.3.
gnu: kodi: Update to 21.2.

gnu/local.mk | 1 -
gnu/packages/file-systems.scm | 25 ++++
gnu/packages/kodi.scm | 110 ++++++++++--------
.../patches/kodi-mesa-eglchromium.patch | 56 ---------
4 files changed, 84 insertions(+), 108 deletions(-)
delete mode 100644 gnu/packages/patches/kodi-mesa-eglchromium.patch


base-commit: 8bc831325a905dbd9015739b58e3a5138d2217da
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 1/6] gnu: Add libudfread.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224250.3892-1-nandre@riseup.net
* gnu/packages/file-systems.scm (libudfread): New variable.

Change-Id: I0c77b082447d02dcd188266257025bf5646b7801
---
gnu/packages/file-systems.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (45 lines)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 34a3f0f64d..0b44c387af 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2025 Julian Flake <flake@uni-koblenz.de>
;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
;;
;;; This file is part of GNU Guix.
;;;
@@ -2191,6 +2192,30 @@ (define-public udftools
and rewritable media that wears out (DVD/CD-RW).")
(license license:gpl2+)))
+(define-public libudfread
+ (package
+ (name "libudfread")
+ (version "1.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.videolan.org/pub/videolan/libudfread/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake autoconf libtool pkg-config))
+ (home-page "https://code.videolan.org/videolan/libudfread")
+ (synopsis "C library to read UDF file systems")
+ (description "@code{libudfread} is a C library for reading
+@acronym{UDF, Universal Disk Format} file systems. @acronym{UDF, Universal
+Disk Format} is a file system mostly used for DVDs and other optical media.
+It supports read-only media (DVD/CD-R) and rewritable media that wears out
+(DVD/CD-RW).")
+ (license license:lgpl2.1+)))
+
(define-public fuse-overlayfs
(package
(name "fuse-overlayfs")
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 2/6] gnu: crossguid: Update to ca1bf4b81.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224325.3913-1-nandre@riseup.net
* gnu/packages/kodi.scm (crossguid): Update to
ca1bf4b810e2d188d04cb6286f957008ee1b7681, revision 3.
[build-system]: Change to cmake-build-system.
[argument] <#:phases>: Remove it, use defaults.
<#:tests?>: Set to false, as there are no tests.

Change-Id: Ie482b10c4266042945d3d27cbd05f513421479f3
---
gnu/packages/kodi.scm | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)

Toggle diff (52 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 589fb386ab..8abe71ccb1 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -90,8 +90,8 @@ (define-module (gnu packages kodi)
#:use-module (gnu packages assembly))
(define-public crossguid
- (let ((commit "fef89a4174a7bf8cd99fa9154864ce9e8e3bf989")
- (revision "2"))
+ (let ((commit "ca1bf4b810e2d188d04cb6286f957008ee1b7681")
+ (revision "3"))
(package
(name "crossguid")
(version (string-append "0.0-" revision "." (string-take commit 7)))
@@ -104,31 +104,10 @@ (define-public crossguid
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1blrkc7zcqrqcr5msvhyhm98s2jvm9hr0isqs4288q2r4mdnrfq0"))))
- (build-system gnu-build-system)
+ "1x3jc4q6di79x3nlx36394s03yv1j1j5k0x6zljyk5iq78y4mfyz"))))
+ (build-system cmake-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (replace 'build
- (lambda _
- (invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
- "-DGUID_LIBUUID")
- (invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
- (replace 'check
- (lambda _
- (invoke "g++" "-c" "test.cpp" "-o" "test.o")
- (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o")
- (invoke "g++" "test.o" "guid.o" "testmain.o"
- "-o" "test" "-luuid")
- (invoke (string-append (getcwd) "/test"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "guid.h" (string-append out "/include"))
- (install-file "libcrossguid.a"
- (string-append out "/lib"))
- #t))))))
+ '(#:tests? #f))
(inputs
`(("libuuid" ,util-linux "lib")))
(synopsis "Lightweight universal identifier library")
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 3/6] gnu: libdvdnav/kodi: Update to 6.1.1.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224344.3932-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdnav/kodi): Update to 6.1.1.

Change-Id: Ie3423ae8c6bb0415abf470d4d452e16d74f4f6ee
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 8abe71ccb1..615c94a71e 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -121,7 +121,7 @@ (define-public crossguid
;; of the standard build process. To make things easier, we bootstrap
;; and patch shebangs here, so we don't have to worry about it later.
(define libdvdnav/kodi
- (let ((commit "6.0.0-Leia-Alpha-3"))
+ (let ((commit "6.1.1"))
(package
(name "libdvdnav-bootstrapped")
(version commit)
@@ -133,7 +133,7 @@ (define libdvdnav/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"))))
+ "190wp4czs4594496vc6ifswg24wijd7c1z0whdkjdaf26rff5xha"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 4/6] gnu: libdvdread/kodi: Update to 6.1.3.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224402.3951-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdread/kodi): Update to 6.1.3.

Change-Id: Id78bbb48c3e1697721a540acd388388b30f8224e
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 615c94a71e..f42fcdb2b4 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -156,7 +156,7 @@ (define libdvdnav/kodi
(license license:gpl2+))))
(define libdvdread/kodi
- (let ((commit "6.0.0-Leia-Alpha-3"))
+ (let ((commit "6.1.3"))
(package
(name "libdvdread-bootstrapped")
(version commit)
@@ -168,7 +168,7 @@ (define libdvdread/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"))))
+ "0by70r55575xa9rl8dp8594lxhm475splslvafskqid30n9cpq8h"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 5/6] gnu: libdvdcss/kodi: Update to 1.4.3.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224426.3972-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdcss/kodi): Update to 1.4.3.

Change-Id: I04e224733c9222c5779674b5c82a6280b8055a75
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index f42fcdb2b4..103329a82b 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -191,7 +191,7 @@ (define libdvdread/kodi
(license (list license:gpl2+ license:lgpl2.1+)))))
(define libdvdcss/kodi
- (let ((commit "1.4.2-Leia-Beta-5"))
+ (let ((commit "1.4.3"))
(package
(name "libdvdcss-bootstrapped")
(version commit)
@@ -203,7 +203,7 @@ (define libdvdcss/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"))))
+ "1xvs3vhdjjrm019rk907bd4lw7jh3wb7rh88zqd3xv8iq3apbcg6"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH 6/6] gnu: kodi: Update to 21.2.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250225224453.3991-1-nandre@riseup.net
* gnu/packages/kodi.scm (kodi): Update to 21.2.
[source] <commit>: Adjust for new release name.
<patches>: Remove obsolete.
<snippet>: Remove references to unexisting files, add new ones.
[arguments] <#:phases> ('patch-stuff): Adjust substitute regex to match
current cmake files; Remove regex substitution for already disabled test
(GetOsVersion); Add regex to match new failing test (PingHost).
[native-inputs]: Update java-commons-lang to version 3;
Add java-commons-text.
[inputs]: Update ffmpeg to default; Add libudfread and tinyxml2.

* gnu/local.mk (dist_patch_DATA): Remove obsolete patch.
* gnu/packages/patches/kodi-mesa-eglchromium.patch: Remove file.

Change-Id: I03c79620cd89d7a29c7993f9839d35f2c2387b2b
---
gnu/local.mk | 1 -
gnu/packages/kodi.scm | 67 +++++++++++++------
.../patches/kodi-mesa-eglchromium.patch | 56 ----------------
3 files changed, 48 insertions(+), 76 deletions(-)

Toggle diff (237 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index c8a29bf98b..e38de5ec62 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1696,7 +1696,6 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
- %D%/packages/patches/kodi-mesa-eglchromium.patch \
%D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
%D%/packages/patches/kvmfr-linux-module-fix-build.patch \
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 103329a82b..938fa35e80 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -256,31 +257,31 @@ (define-public fstrcmp
(define-public kodi
(package
(name "kodi")
- (version "19.5")
+ (version "21.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xbmc/xbmc")
- (commit (string-append version "-Matrix"))))
+ (commit (string-append version "-Omega"))))
(file-name (git-file-name name version))
(sha256
(base32
- "1pfd1ajivr865h0fkpbv778626c4czrvq8650bzqv9aqzh8f36my"))
- (patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"
- "kodi-mesa-eglchromium.patch"))
+ "1kq35hn7fl8fhsv5xvqb7snsh9lbzix56pafqz8flgc5mrrckm25"))
+ (patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(use-modules (guix build utils))
(for-each delete-file-recursively
'("project/BuildDependencies/"
- "tools/codegenerator/groovy/commons-lang-2.6.jar"
- "tools/codegenerator/groovy/groovy-all-2.4.4.jar"
;; Purge these sources:
;; "tools/depend/native/JsonSchemaBuilder"
;; "tools/depend/native/TexturePacker"
;; "lib/libUPnP"
"lib/libUPnP/Neptune/ThirdParty"
+ "lib/libUPnP/Platinum/ThirdParty"
+ "lib/win32"
+ "tools/android/packaging/gradle/wrapper/gradle-wrapper.jar"
"project/Win32BuildSetup/tools/7z"))))))
(build-system cmake-build-system)
(arguments
@@ -321,21 +322,45 @@ (define-public kodi
"COMMAND groovy")
(("ARGS \\$\\{JAVA_OPEN_OPTS\\} -cp \"\\$\\{classpath\\}\" groovy.ui.GroovyMain")
"ARGS -cp \"${classpath}\" ")
- (("classpath \\$\\{GROOVY_DIR\\}/groovy-all-\\$\\{GROOVY_VER\\}.jar")
- "classpath ")
- (("\\$\\{GROOVY_DIR\\}/commons-lang-\\$\\{COMMONS_VER\\}.jar")
- (search-input-file inputs "/share/java/commons-lang-2.6.jar"))
+ (("classpath \\$\\{groovy_SOURCE_DIR\\}")
+ (string-append "classpath " (assoc-ref inputs "groovy")))
+ (("\\$\\{apache-commons-lang_SOURCE_DIR\\}")
+ (dirname
+ (search-input-file
+ inputs
+ "/lib/m2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar")))
+ (("\\$\\{apache-commons-text_SOURCE_DIR\\}")
+ (dirname
+ (search-input-file
+ inputs
+ "/lib/m2/org/apache/commons/commons-text/1.9/commons-text-1.9.jar")))
+ (("FetchContent_MakeAvailable\\(groovy\\)")
+ (string-append "set(groovy_SOURCE_DIR " (assoc-ref inputs "groovy") ")"))
+ (("FetchContent_MakeAvailable\\(apache-commons-lang\\)")
+ (string-append "set(apache-commons-lang_SOURCE_DIR "
+ (assoc-ref inputs "java-commons-lang3")
+ "/lib/m2/org/apache/commons/commons-lang3/3.12.0)"))
+ (("FetchContent_MakeAvailable\\(apache-commons-text\\)")
+ (string-append "set(apache-commons-text_SOURCE_DIR "
+ (assoc-ref inputs "java-commons-text")
+ "/lib/m2/org/apache/commons/commons-text/1.9)"))
(("^set\\(GROOVY_VER.*")
(string-append "set(GROOVY_VER 3.0.5)\n")))
;; Prevent the build scripts from calling autoreconf in the
;; build stage. Otherwise, it would undo the bootstrapping
;; and shebang patching that we worked so hard for.
- (substitute* "cmake/modules/FindLibDvd.cmake"
+ (substitute* "cmake/modules/FindLibDvdCSS.cmake"
;; The libdvd* sources that we bootstrapped separately are
;; unpacked in the build phase. This is our best opportunity
;; to make them writable before the build process starts.
- (("autoreconf -vif") "chmod -R u+w ."))
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
+
+ (substitute* "cmake/modules/FindLibDvdNav.cmake"
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
+
+ (substitute* "cmake/modules/FindLibDvdRead.cmake"
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
(substitute* "xbmc/platform/posix/PosixTimezone.cpp"
(("/usr/share/zoneinfo")
@@ -353,9 +378,7 @@ (define-public kodi
(("TEST_F\\(TestSystemInfo, GetOsPrettyNameWithVersion\\)")
"TEST_F(TestSystemInfo, DISABLED_GetOsPrettyNameWithVersion)")
(("TEST_F\\(TestSystemInfo, GetOsName\\)")
- "TEST_F(TestSystemInfo, DISABLED_GetOsName)")
- (("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
- "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))
+ "TEST_F(TestSystemInfo, DISABLED_GetOsName)"))
(substitute* "xbmc/utils/test/TestCPUInfo.cpp"
(("TEST_F\\(TestCPUInfo, GetCPUFrequency\\)")
"TEST_F(TestCPUInfo, DISABLED_GetCPUFrequency)"))
@@ -363,7 +386,10 @@ (define-public kodi
(("TEST_F\\(TestDateTime, TmOperators\\)")
"TEST_F(TestDateTime, DISABLED_TmOperators)")
(("TEST_F\\(TestDateTime, GetAsTm\\)")
- "TEST_F(TestDateTime, DISABLED_GetAsTm)"))))
+ "TEST_F(TestDateTime, DISABLED_GetAsTm)"))
+ (substitute* "xbmc/network/test/TestNetwork.cpp"
+ (("TEST_F\\(TestNetwork, PingHost\\)")
+ "TEST_F(TestNetwork, DISABLED_PingHost)"))))
(add-before 'build 'set-build-environment
(lambda _
;; Some bundled build scripts fall back to /bin/sh
@@ -383,7 +409,8 @@ (define-public kodi
googletest
groovy
openjdk9 ;like groovy
- java-commons-lang
+ java-commons-lang3
+ java-commons-text
libdvdcss/kodi
libdvdnav/kodi
libdvdread/kodi
@@ -400,7 +427,7 @@ (define-public kodi
dcadec
dbus
eudev
- ffmpeg-4
+ ffmpeg
flac
flatbuffers
fmt
@@ -429,6 +456,7 @@ (define-public kodi
libpng
libssh
libtiff
+ libudfread
libva
libvorbis
libxcrypt
@@ -449,6 +477,7 @@ (define-public kodi
sqlite
taglib
tinyxml
+ tinyxml2
tzdata
util-linux
zip
diff --git a/gnu/packages/patches/kodi-mesa-eglchromium.patch b/gnu/packages/patches/kodi-mesa-eglchromium.patch
deleted file mode 100644
index 3324062274..0000000000
--- a/gnu/packages/patches/kodi-mesa-eglchromium.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
-From 5449652abf0bb9dddd0d796de4120e60f19f89a5 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..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 <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
--
2.48.1
André Batista wrote 2 weeks ago
[PATCH v2 1/6] gnu: Add libudfread.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250228195544.2415-1-nandre@riseup.net
* gnu/packages/cdrom.scm (libudfread): New variable.

Change-Id: Ifcd7d28474ec4b8061b2914d26d3f20f81f960cd
---
gnu/packages/cdrom.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (47 lines)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 98c9127803..574f4e26d3 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
;;; Copyright © 2025 Yovan Naumovski <yovan@gorski.stream>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -970,6 +971,30 @@ (define-public libisofs
Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
(license gpl2+)))
+(define-public libudfread
+ (package
+ (name "libudfread")
+ (version "1.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.videolan.org/pub/videolan/libudfread/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake autoconf libtool pkg-config))
+ (home-page "https://code.videolan.org/videolan/libudfread")
+ (synopsis "C library to read UDF file systems")
+ (description "@code{libudfread} is a C library for reading
+@acronym{UDF, Universal Disk Format} file systems. @acronym{UDF, Universal
+Disk Format} is a file system mostly used for DVDs and other optical media.
+It supports read-only media (DVD/CD-R) and rewritable media that wears out
+(DVD/CD-RW).")
+ (license license:lgpl2.1+)))
+
(define-public cdrkit-libre
(package
(name "cdrkit-libre")

base-commit: 8bc831325a905dbd9015739b58e3a5138d2217da
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 1/6] gnu: Add libudfread.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308130856.7798-1-nandre@riseup.net
* gnu/packages/cdrom.scm (libudfread): New variable.

Change-Id: Ifcd7d28474ec4b8061b2914d26d3f20f81f960ce
---
gnu/packages/cdrom.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)

Toggle diff (47 lines)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 98c9127803..574f4e26d3 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Julian Flake <flake@uni-koblenz.de>
;;; Copyright © 2025 Yovan Naumovski <yovan@gorski.stream>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -970,6 +971,30 @@ (define-public libisofs
Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
(license gpl2+)))
+(define-public libudfread
+ (package
+ (name "libudfread")
+ (version "1.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.videolan.org/pub/videolan/libudfread/"
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list automake autoconf libtool pkg-config))
+ (home-page "https://code.videolan.org/videolan/libudfread")
+ (synopsis "C library to read UDF file systems")
+ (description "@code{libudfread} is a C library for reading
+@acronym{UDF, Universal Disk Format} file systems. @acronym{UDF, Universal
+Disk Format} is a file system mostly used for DVDs and other optical media.
+It supports read-only media (DVD/CD-R) and rewritable media that wears out
+(DVD/CD-RW).")
+ (license lgpl2.1+)))
+
(define-public cdrkit-libre
(package
(name "cdrkit-libre")

base-commit: 535efb3c9add7e32530aa0dced40b18b12b8ed95
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 2/6] gnu: crossguid: Update to ca1bf4b810e2d188d04cb6286f957008ee1b7681.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308181915.11665-1-nandre@riseup.net
* gnu/packages/kodi.scm (crossguid): Update to
ca1bf4b810e2d188d04cb6286f957008ee1b7681, revision 3.
[build-system]: Change to cmake-build-system.
[argument] <#:phases>: Remove it, use defaults.
<#:tests?>: Set to false, as there are no tests.

Change-Id: I183ab953b0fb1092efbd7d17b0d3bfe2394cfe43
---
gnu/packages/kodi.scm | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)

Toggle diff (52 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 589fb386ab..8abe71ccb1 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -90,8 +90,8 @@ (define-module (gnu packages kodi)
#:use-module (gnu packages assembly))
(define-public crossguid
- (let ((commit "fef89a4174a7bf8cd99fa9154864ce9e8e3bf989")
- (revision "2"))
+ (let ((commit "ca1bf4b810e2d188d04cb6286f957008ee1b7681")
+ (revision "3"))
(package
(name "crossguid")
(version (string-append "0.0-" revision "." (string-take commit 7)))
@@ -104,31 +104,10 @@ (define-public crossguid
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1blrkc7zcqrqcr5msvhyhm98s2jvm9hr0isqs4288q2r4mdnrfq0"))))
- (build-system gnu-build-system)
+ "1x3jc4q6di79x3nlx36394s03yv1j1j5k0x6zljyk5iq78y4mfyz"))))
+ (build-system cmake-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (replace 'build
- (lambda _
- (invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
- "-DGUID_LIBUUID")
- (invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
- (replace 'check
- (lambda _
- (invoke "g++" "-c" "test.cpp" "-o" "test.o")
- (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o")
- (invoke "g++" "test.o" "guid.o" "testmain.o"
- "-o" "test" "-luuid")
- (invoke (string-append (getcwd) "/test"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "guid.h" (string-append out "/include"))
- (install-file "libcrossguid.a"
- (string-append out "/lib"))
- #t))))))
+ '(#:tests? #f))
(inputs
`(("libuuid" ,util-linux "lib")))
(synopsis "Lightweight universal identifier library")
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 3/6] gnu: libdvdnav/kodi: Update to 6.1.1.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308181933.11686-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdnav/kodi): Update to 6.1.1.

Change-Id: I67790ce579be2ec61b0ea57594fe32e73f382faa
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 8abe71ccb1..615c94a71e 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -121,7 +121,7 @@ (define-public crossguid
;; of the standard build process. To make things easier, we bootstrap
;; and patch shebangs here, so we don't have to worry about it later.
(define libdvdnav/kodi
- (let ((commit "6.0.0-Leia-Alpha-3"))
+ (let ((commit "6.1.1"))
(package
(name "libdvdnav-bootstrapped")
(version commit)
@@ -133,7 +133,7 @@ (define libdvdnav/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"))))
+ "190wp4czs4594496vc6ifswg24wijd7c1z0whdkjdaf26rff5xha"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 4/6] gnu: libdvdread/kodi: Update to 6.1.3.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308182003.11705-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdread/kodi): Update to 6.1.3.

Change-Id: I82f1b7fefa1ca186a7920dfdea107adc754972de
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 615c94a71e..f42fcdb2b4 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -156,7 +156,7 @@ (define libdvdnav/kodi
(license license:gpl2+))))
(define libdvdread/kodi
- (let ((commit "6.0.0-Leia-Alpha-3"))
+ (let ((commit "6.1.3"))
(package
(name "libdvdread-bootstrapped")
(version commit)
@@ -168,7 +168,7 @@ (define libdvdread/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"))))
+ "0by70r55575xa9rl8dp8594lxhm475splslvafskqid30n9cpq8h"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 5/6] gnu: libdvdcss/kodi: Update to 1.4.3.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308182015.11724-1-nandre@riseup.net
* gnu/packages/kodi.scm (libdvdcss/kodi): Update to 1.4.3.

Change-Id: I7fdda774623f6750f212d96395d2e04c107d44de
---
gnu/packages/kodi.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index f42fcdb2b4..103329a82b 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -191,7 +191,7 @@ (define libdvdread/kodi
(license (list license:gpl2+ license:lgpl2.1+)))))
(define libdvdcss/kodi
- (let ((commit "1.4.2-Leia-Beta-5"))
+ (let ((commit "1.4.3"))
(package
(name "libdvdcss-bootstrapped")
(version commit)
@@ -203,7 +203,7 @@ (define libdvdcss/kodi
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"))))
+ "1xvs3vhdjjrm019rk907bd4lw7jh3wb7rh88zqd3xv8iq3apbcg6"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f
--
2.48.1
André Batista wrote 4 days ago
[PATCH v3 6/6] gnu: kodi: Update to 21.2.
(address . 76570@debbugs.gnu.org)(name . André Batista)(address . nandre@riseup.net)
20250308182030.11743-1-nandre@riseup.net
* gnu/packages/kodi.scm (kodi): Update to 21.2.
[source] <commit>: Adjust for new release name.
<patches>: Remove obsolete.
<snippet>: Remove references to unexisting files, add new ones.
[arguments] <#:phases> ('patch-stuff): Adjust substitute regex to match
current cmake files; Remove regex substitution for already disabled test
(GetOsVersion); Add regex to match new failing test (PingHost).
[native-inputs]: Update java-commons-lang to version 3;
Add java-commons-text.
[inputs]: Update ffmpeg to default; Add libudfread and tinyxml2.

* gnu/local.mk (dist_patch_DATA): Remove obsolete patch.
* gnu/packages/patches/kodi-mesa-eglchromium.patch: Remove file.

Change-Id: Iedbacaf037d79de8011c9f3f45c984f8a0586768
---
gnu/local.mk | 1 -
gnu/packages/kodi.scm | 67 +++++++++++++------
.../patches/kodi-mesa-eglchromium.patch | 56 ----------------
3 files changed, 48 insertions(+), 76 deletions(-)

Toggle diff (237 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 997b7344ff..9dcc293e4f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1698,7 +1698,6 @@ dist_patch_DATA = \
%D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch \
%D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch \
%D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \
- %D%/packages/patches/kodi-mesa-eglchromium.patch \
%D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
%D%/packages/patches/kvmfr-linux-module-fix-build.patch \
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 103329a82b..938fa35e80 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -256,31 +257,31 @@ (define-public fstrcmp
(define-public kodi
(package
(name "kodi")
- (version "19.5")
+ (version "21.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/xbmc/xbmc")
- (commit (string-append version "-Matrix"))))
+ (commit (string-append version "-Omega"))))
(file-name (git-file-name name version))
(sha256
(base32
- "1pfd1ajivr865h0fkpbv778626c4czrvq8650bzqv9aqzh8f36my"))
- (patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"
- "kodi-mesa-eglchromium.patch"))
+ "1kq35hn7fl8fhsv5xvqb7snsh9lbzix56pafqz8flgc5mrrckm25"))
+ (patches (search-patches "kodi-set-libcurl-ssl-parameters.patch"))
(modules '((guix build utils)))
(snippet
'(begin
(use-modules (guix build utils))
(for-each delete-file-recursively
'("project/BuildDependencies/"
- "tools/codegenerator/groovy/commons-lang-2.6.jar"
- "tools/codegenerator/groovy/groovy-all-2.4.4.jar"
;; Purge these sources:
;; "tools/depend/native/JsonSchemaBuilder"
;; "tools/depend/native/TexturePacker"
;; "lib/libUPnP"
"lib/libUPnP/Neptune/ThirdParty"
+ "lib/libUPnP/Platinum/ThirdParty"
+ "lib/win32"
+ "tools/android/packaging/gradle/wrapper/gradle-wrapper.jar"
"project/Win32BuildSetup/tools/7z"))))))
(build-system cmake-build-system)
(arguments
@@ -321,21 +322,45 @@ (define-public kodi
"COMMAND groovy")
(("ARGS \\$\\{JAVA_OPEN_OPTS\\} -cp \"\\$\\{classpath\\}\" groovy.ui.GroovyMain")
"ARGS -cp \"${classpath}\" ")
- (("classpath \\$\\{GROOVY_DIR\\}/groovy-all-\\$\\{GROOVY_VER\\}.jar")
- "classpath ")
- (("\\$\\{GROOVY_DIR\\}/commons-lang-\\$\\{COMMONS_VER\\}.jar")
- (search-input-file inputs "/share/java/commons-lang-2.6.jar"))
+ (("classpath \\$\\{groovy_SOURCE_DIR\\}")
+ (string-append "classpath " (assoc-ref inputs "groovy")))
+ (("\\$\\{apache-commons-lang_SOURCE_DIR\\}")
+ (dirname
+ (search-input-file
+ inputs
+ "/lib/m2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar")))
+ (("\\$\\{apache-commons-text_SOURCE_DIR\\}")
+ (dirname
+ (search-input-file
+ inputs
+ "/lib/m2/org/apache/commons/commons-text/1.9/commons-text-1.9.jar")))
+ (("FetchContent_MakeAvailable\\(groovy\\)")
+ (string-append "set(groovy_SOURCE_DIR " (assoc-ref inputs "groovy") ")"))
+ (("FetchContent_MakeAvailable\\(apache-commons-lang\\)")
+ (string-append "set(apache-commons-lang_SOURCE_DIR "
+ (assoc-ref inputs "java-commons-lang3")
+ "/lib/m2/org/apache/commons/commons-lang3/3.12.0)"))
+ (("FetchContent_MakeAvailable\\(apache-commons-text\\)")
+ (string-append "set(apache-commons-text_SOURCE_DIR "
+ (assoc-ref inputs "java-commons-text")
+ "/lib/m2/org/apache/commons/commons-text/1.9)"))
(("^set\\(GROOVY_VER.*")
(string-append "set(GROOVY_VER 3.0.5)\n")))
;; Prevent the build scripts from calling autoreconf in the
;; build stage. Otherwise, it would undo the bootstrapping
;; and shebang patching that we worked so hard for.
- (substitute* "cmake/modules/FindLibDvd.cmake"
+ (substitute* "cmake/modules/FindLibDvdCSS.cmake"
;; The libdvd* sources that we bootstrapped separately are
;; unpacked in the build phase. This is our best opportunity
;; to make them writable before the build process starts.
- (("autoreconf -vif") "chmod -R u+w ."))
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
+
+ (substitute* "cmake/modules/FindLibDvdNav.cmake"
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
+
+ (substitute* "cmake/modules/FindLibDvdRead.cmake"
+ (("\\$\\{AUTORECONF\\} -vif") "chmod -R u+w ."))
(substitute* "xbmc/platform/posix/PosixTimezone.cpp"
(("/usr/share/zoneinfo")
@@ -353,9 +378,7 @@ (define-public kodi
(("TEST_F\\(TestSystemInfo, GetOsPrettyNameWithVersion\\)")
"TEST_F(TestSystemInfo, DISABLED_GetOsPrettyNameWithVersion)")
(("TEST_F\\(TestSystemInfo, GetOsName\\)")
- "TEST_F(TestSystemInfo, DISABLED_GetOsName)")
- (("TEST_F\\(TestSystemInfo, GetOsVersion\\)")
- "TEST_F(TestSystemInfo, DISABLED_GetOsVersion)"))
+ "TEST_F(TestSystemInfo, DISABLED_GetOsName)"))
(substitute* "xbmc/utils/test/TestCPUInfo.cpp"
(("TEST_F\\(TestCPUInfo, GetCPUFrequency\\)")
"TEST_F(TestCPUInfo, DISABLED_GetCPUFrequency)"))
@@ -363,7 +386,10 @@ (define-public kodi
(("TEST_F\\(TestDateTime, TmOperators\\)")
"TEST_F(TestDateTime, DISABLED_TmOperators)")
(("TEST_F\\(TestDateTime, GetAsTm\\)")
- "TEST_F(TestDateTime, DISABLED_GetAsTm)"))))
+ "TEST_F(TestDateTime, DISABLED_GetAsTm)"))
+ (substitute* "xbmc/network/test/TestNetwork.cpp"
+ (("TEST_F\\(TestNetwork, PingHost\\)")
+ "TEST_F(TestNetwork, DISABLED_PingHost)"))))
(add-before 'build 'set-build-environment
(lambda _
;; Some bundled build scripts fall back to /bin/sh
@@ -383,7 +409,8 @@ (define-public kodi
googletest
groovy
openjdk9 ;like groovy
- java-commons-lang
+ java-commons-lang3
+ java-commons-text
libdvdcss/kodi
libdvdnav/kodi
libdvdread/kodi
@@ -400,7 +427,7 @@ (define-public kodi
dcadec
dbus
eudev
- ffmpeg-4
+ ffmpeg
flac
flatbuffers
fmt
@@ -429,6 +456,7 @@ (define-public kodi
libpng
libssh
libtiff
+ libudfread
libva
libvorbis
libxcrypt
@@ -449,6 +477,7 @@ (define-public kodi
sqlite
taglib
tinyxml
+ tinyxml2
tzdata
util-linux
zip
diff --git a/gnu/packages/patches/kodi-mesa-eglchromium.patch b/gnu/packages/patches/kodi-mesa-eglchromium.patch
deleted file mode 100644
index 3324062274..0000000000
--- a/gnu/packages/patches/kodi-mesa-eglchromium.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
-From 5449652abf0bb9dddd0d796de4120e60f19f89a5 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..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 <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
--
2.48.1
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 76570@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 76570
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help