From patchwork Sat Mar 8 18:20:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 39949 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5FC1D27BBEA; Sat, 8 Mar 2025 18:21:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDD0327BBE9 for ; Sat, 8 Mar 2025 18:21:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqynK-0002zG-KI; Sat, 08 Mar 2025 13:21:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqynI-0002sm-0Z for guix-patches@gnu.org; Sat, 08 Mar 2025 13:21:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqynH-0005vX-MS for guix-patches@gnu.org; Sat, 08 Mar 2025 13:21:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=W68v+E+6lqvtxni/kOmHEVqfY5xoFNBUF6rtFAw1TWg=; b=dXfWcjvJowhiLgRUo4xqyRlxPaW/Y495MkizoN5ysltZuaCbHvaqgHzMvEqV2VzD6ro/k6ANsPM4WYR9Kmi8+eiZaJKi0GitnxmG0+DBTcQSea2ma30XQ3V5mU0Dh43ibof5uTsbEIpKlxTCVqdVaBfJIksAGIjuMDN8YTUn1uX9M98+LemkLiN9uk1rCEfWQlFrIC+BPpsxth7pNsdbf2ftiEjMhbAT5SMPYdjiwurDt+3trECmmUc6W6LPKkxQK+CurWNpS+yOHROVyXUJgB6jJEN20dR7v8T8+Hq8PI4kFLKVcKeTx7hxjFrOhKyBLWpuXkG5ujWuLMojmUsm3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqynH-00057J-IG for guix-patches@gnu.org; Sat, 08 Mar 2025 13:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76570] [PATCH v3 6/6] gnu: kodi: Update to 21.2. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Mar 2025 18:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76570@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista Received: via spool by 76570-submit@debbugs.gnu.org id=B76570.174145805919620 (code B ref 76570); Sat, 08 Mar 2025 18:21:03 +0000 Received: (at 76570) by debbugs.gnu.org; 8 Mar 2025 18:20:59 +0000 Received: from localhost ([127.0.0.1]:56755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqynC-00056N-4u for submit@debbugs.gnu.org; Sat, 08 Mar 2025 13:20:58 -0500 Received: from mx1.riseup.net ([198.252.153.129]:56202) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqyn8-000568-S9 for 76570@debbugs.gnu.org; Sat, 08 Mar 2025 13:20:56 -0500 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4Z9BKs0fKBzDshC for <76570@debbugs.gnu.org>; Sat, 8 Mar 2025 18:20:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1741458049; bh=VSjYKIuZW3m55eSswlGU11Rtp94BtLSYJ4poDNvmCEI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jO5CCAkzx22IiZ/Xv8xam845Oc7KVeqHIaNJDoG4GEU/UOVtGTvxqXHH5T4wzgN2N aaMmy3TEwJ6N1PFvdnbStMrJgzthwdo0UIVy/DGnH1+sIUSWzMqzjjuQfiw6bi3WHt DHE84FYt602ExNZmxL73xoXPjXmRSuC07gB2NtXo= X-Riseup-User-ID: 59BA44094D56BC5EA473D3F85E75A4CC8488F0C47DFE630718EB5281BAE48976 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4Z9BKc52wczFvZ6; Sat, 8 Mar 2025 18:20:36 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Sat, 8 Mar 2025 15:20:28 -0300 Message-ID: <20250308182030.11743-1-nandre@riseup.net> In-Reply-To: <20250308130856.7798-1-nandre@riseup.net> References: <20250308130856.7798-1-nandre@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kodi.scm (kodi): Update to 21.2. [source] : Adjust for new release name. : Remove obsolete. : 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(-) 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 ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2024 Nicolas Graves +;;; Copyright © 2025 André Batista ;;; ;;; 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 -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