From patchwork Wed Dec 13 16:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 57572 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 7A4E027BBEA; Wed, 13 Dec 2023 17:00:00 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 A181627BBE2 for ; Wed, 13 Dec 2023 16:59:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDSaL-0004uZ-VJ; Wed, 13 Dec 2023 11:59:51 -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 1rDSaI-0004sa-D1 for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:46 -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 1rDSaI-0005EG-4p for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDSaY-00046u-53 for guix-patches@gnu.org; Wed, 13 Dec 2023 12:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67814] [PATCH 1/3] gnu: glad: Update to 2.0.4. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 17:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67814@debbugs.gnu.org Received: via spool by 67814-submit@debbugs.gnu.org id=B67814.170248675315685 (code B ref 67814); Wed, 13 Dec 2023 17:00:02 +0000 Received: (at 67814) by debbugs.gnu.org; 13 Dec 2023 16:59:13 +0000 Received: from localhost ([127.0.0.1]:59609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZk-00044p-CL for submit@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:13 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:37232 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZh-00044V-9f for 67814@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:11 -0500 Received: from localhost.localdomain (unknown [111.0.51.71]) by APP-05 (Coremail) with SMTP id zQCowAD3_m7C4nllBzsOAQ--.2099S2; Thu, 14 Dec 2023 00:58:42 +0800 (CST) From: Zheng Junjie Date: Thu, 14 Dec 2023 00:57:36 +0800 Message-ID: <2451c8b3511c2a3c20250fcfe690c59f7538e534.1702486251.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAD3_m7C4nllBzsOAQ--.2099S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [111.0.51.71] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/gl.scm (glad): Update to 2.0.4. [inputs]: Add python-jinja2. [arguments]<#:phases>: Adjust install-cmakelists.txt phase. (glad-0.1): Inherit above. gnu/packages/electronics.scm (openboardview) [native-inputs]: Use glad-0.1 replace glad. Change-Id: I516d44dfc9272702c3ac31773df0b6c2d68ed99c --- gnu/packages/electronics.scm | 3 ++- gnu/packages/gl.scm | 50 +++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 7d0e58aeae..13f370c285 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -310,7 +311,7 @@ (define-public openboardview (native-inputs (list pkg-config python - glad + glad-0.1 stb-image utf8-h)) (inputs diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c02a6f0a84..62e8efbb98 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2021, 2022, 2023 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -192,12 +193,9 @@ (define-public ftgl (define-public glad (package (name "glad") - (version "0.1.36") + (version "2.0.4") (source (origin - ;; We fetch the sources from the repository since the PyPI archive - ;; doesn't contain the CMakeLists.txt file which is useful for - ;; integration with other software, such as the openboardview package. (method git-fetch) (uri (git-reference (url "https://github.com/Dav1dde/glad") @@ -205,22 +203,50 @@ (define-public glad (file-name (git-file-name name version)) (sha256 (base32 - "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n")))) + "1pam6imhcmcyqrqi6wzzxprb23y8x6zdbvsjavnz26k72i9dbbja")))) (build-system python-build-system) + (inputs (list python-jinja2)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-cmakelists.txt - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/" ,name))) - (install-file "CMakeLists.txt" share))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-cmakelists.txt + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/" #$name))) + (install-file "cmake/CMakeLists.txt" share))))))) (home-page "https://github.com/Dav1dde/glad") (synopsis "Multi-language GL/GLES/EGL/GLX/WGL loader generator") (description "Glad uses the official Khronos XML specifications to generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (license license:expat))) +(define-public glad-0.1 + (package + (inherit glad) + (name "glad") + (version "0.1.36") + (source + (origin + ;; We fetch the sources from the repository since the PyPI archive + ;; doesn't contain the CMakeLists.txt file which is useful for + ;; integration with other software, such as the openboardview package. + (method git-fetch) + (uri (git-reference + (url "https://github.com/Dav1dde/glad") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m55ya1zrmg6n2cljkajy80ilmi5sblln8742fm0k1sw9k7hzn8n")))) + (inputs (list)) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'install 'install-cmakelists.txt + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/" ,name))) + (install-file "CMakeLists.txt" share))))))))) + (define-public s2tc (package (name "s2tc") From patchwork Wed Dec 13 16:57:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 57574 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 4D71327BBEA; Wed, 13 Dec 2023 17:00:28 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 C1C8327BBE2 for ; Wed, 13 Dec 2023 17:00:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDSaN-0004v3-MF; Wed, 13 Dec 2023 11:59:51 -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 1rDSaI-0004tz-Uh for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:47 -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 1rDSaI-0005EO-Lo for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDSaY-000477-MY for guix-patches@gnu.org; Wed, 13 Dec 2023 12:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67814] [PATCH 2/3] gnu: libplacebo: Update to 6.338.1. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 17:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67814@debbugs.gnu.org Received: via spool by 67814-submit@debbugs.gnu.org id=B67814.170248675515700 (code B ref 67814); Wed, 13 Dec 2023 17:00:02 +0000 Received: (at 67814) by debbugs.gnu.org; 13 Dec 2023 16:59:15 +0000 Received: from localhost ([127.0.0.1]:59612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZn-000458-5M for submit@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:15 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:37234 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZj-00044Z-BB for 67814@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:12 -0500 Received: from localhost.localdomain (unknown [111.0.51.71]) by APP-05 (Coremail) with SMTP id zQCowAD3_m7C4nllBzsOAQ--.2099S3; Thu, 14 Dec 2023 00:58:42 +0800 (CST) From: Zheng Junjie Date: Thu, 14 Dec 2023 00:57:37 +0800 Message-ID: <4929734bbe5aa6b4c206ce132e5e940f35a5034f.1702486251.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAD3_m7C4nllBzsOAQ--.2099S3 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOe7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r18M28lY4IEw2II xxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjc xK6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0 Y4vEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21le4C262 xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r10 6r15McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Y z7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUJVWUGwC2zV AF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4l IxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVF xhVjvjDU0xZFpf9x07j1ApnUUUUU= X-Originating-IP: [111.0.51.71] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/video.scm (libplacebo): Update to 6.338.1. [native-inputs]: Add python-jinja2, glad. Change-Id: Ie9c35cfd964f110ff95ed486ee1c4f5724c82314 --- gnu/packages/video.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 51ebc2a1b2..1f339df517 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2023 Jaeme Sifat +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1533,7 +1534,7 @@ (define-public libmatroska (define-public libplacebo (package (name "libplacebo") - (version "4.208.0") + (version "6.338.1") (source (origin (method git-fetch) @@ -1542,7 +1543,7 @@ (define-public libplacebo (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk")))) + (base32 "1miqk3gfwah01xkf4a6grwq29im0lfh94gp92y7js855gx3v169m")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -1551,7 +1552,11 @@ (define-public libplacebo (assoc-ref %build-inputs "vulkan-headers") "/share/vulkan/registry/vk.xml")))) (native-inputs - (list python python-mako pkg-config)) + (list python python-mako + pkg-config + ;; This package use glad as library, so we add it. + python-jinja2 + glad)) (inputs (list lcms libepoxy From patchwork Wed Dec 13 16:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 57573 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 447D927BBE2; Wed, 13 Dec 2023 17:00:10 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 EAC0927BBE9 for ; Wed, 13 Dec 2023 17:00:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDSaO-0004vO-JU; Wed, 13 Dec 2023 11:59:52 -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 1rDSaJ-0004uY-Hk for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:49 -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 1rDSaJ-0005ET-8j for guix-patches@gnu.org; Wed, 13 Dec 2023 11:59:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDSaZ-00047F-7V for guix-patches@gnu.org; Wed, 13 Dec 2023 12:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67814] [PATCH 3/3] gnu: mpv: Update to 0.37.0. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67814@debbugs.gnu.org Received: via spool by 67814-submit@debbugs.gnu.org id=B67814.170248675815715 (code B ref 67814); Wed, 13 Dec 2023 17:00:03 +0000 Received: (at 67814) by debbugs.gnu.org; 13 Dec 2023 16:59:18 +0000 Received: from localhost ([127.0.0.1]:59614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZp-00045O-KF for submit@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:18 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:37236 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDSZl-00044c-EW for 67814@debbugs.gnu.org; Wed, 13 Dec 2023 11:59:15 -0500 Received: from localhost.localdomain (unknown [111.0.51.71]) by APP-05 (Coremail) with SMTP id zQCowAD3_m7C4nllBzsOAQ--.2099S4; Thu, 14 Dec 2023 00:58:43 +0800 (CST) From: Zheng Junjie Date: Thu, 14 Dec 2023 00:57:38 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAD3_m7C4nllBzsOAQ--.2099S4 X-Coremail-Antispam: 1UD129KBjvJXoWxAFy7XF1kWF1xJry8Cr1kGrg_yoW5WryrpF WfuF9akr95GFyrtws0qF429r4rWrZ7Ca1Du39rXa10kanIvFW0vryjyFWFkF9rXr97J3Wx Wa40qa1UurW5ZFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9jb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x02 67AKxVW8JVW8Jr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvf C2KfnxnUUI43ZEXa7IU53cTJUUUUU== X-Originating-IP: [111.0.51.71] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/video.scm (mpv): Update to 0.37.0. [build-system]: Switch to meson-build-system. [arguments]: <#:configure>: Adjust. <#:phases>: Remove set-up-waf phase. [native-inputs]: Add python-wrapper. [inputs]: Add libplacebo, zimg. Remove python-waf. Change-Id: I0e61761a4d086a1185730f587869c2552b7cacb0 --- gnu/packages/video.scm | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1f339df517..b0cdb8cda7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2343,7 +2343,7 @@ (define-public mplayer (define-public mpv (package (name "mpv") - (version "0.36.0") + (version "0.37.0") (source (origin (method git-fetch) (uri (git-reference @@ -2351,8 +2351,8 @@ (define-public mpv (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ri06h7pv6hrxmxxc618n9hymlgr0gfx38bqq5dcszdgnlashsgk")))) - (build-system waf-build-system) + (base32 "1xcyfpd543lbmg587wi0mahrz8vhyrlr4432054vp6wsi3s36c4b")))) + (build-system meson-build-system) (arguments (list #:phases @@ -2369,20 +2369,15 @@ (define-public mpv ;; and passed as linker flags, but the order in which they are added ;; varies. See . ;; Set PYTHONHASHSEED as a workaround for deterministic results. - (setenv "PYTHONHASHSEED" "1"))) - (add-before 'configure 'set-up-waf - (lambda* (#:key inputs #:allow-other-keys) - (copy-file (search-input-file inputs "bin/waf") "waf") - (setenv "CC" #$(cc-for-target))))) + (setenv "PYTHONHASHSEED" "1")))) #:configure-flags - #~(list "--enable-libmpv-shared" - "--enable-cdda" - "--enable-dvdnav" - "--disable-build-date") - ;; No check function defined. - #:tests? #f)) + #~(list "-Dlibmpv=true" + "-Dcdda=enabled" + "-Ddvdnav=enabled" + "-Dbuild-date=false"))) (native-inputs - (list perl ; for zsh completion file + (list python-wrapper + perl ; for zsh completion file pkg-config python-docutils)) ;; Missing features: libguess, V4L2. (inputs @@ -2400,6 +2395,7 @@ (define-public mpv libdvdread libdvdnav libjpeg-turbo + libplacebo libva libvdpau libx11 @@ -2410,13 +2406,11 @@ (define-public mpv libxrandr libxscrnsaver libxv - ;; XXX: lua > 5.2 is not currently supported; see - ;; waftools/checks/custom.py + ;; XXX: lua > 5.2 is not currently supported; see meson.build lua-5.2 mesa mpg123 pulseaudio - python-waf rsound shaderc vulkan-headers @@ -2424,6 +2418,7 @@ (define-public mpv wayland wayland-protocols yt-dlp + zimg zlib)) (home-page "https://mpv.io/") (synopsis "Audio and video player")