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: Z572 X-Patchwork-Id: 20617 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")