From patchwork Sun Feb 5 11:42:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 46676 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 7200A27BBEB; Sun, 5 Feb 2023 11:43:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 5BB5927BBE9 for ; Sun, 5 Feb 2023 11:43:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOdQJ-000216-0t; Sun, 05 Feb 2023 06:43:07 -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 1pOdQF-00020H-JT for guix-patches@gnu.org; Sun, 05 Feb 2023 06:43:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOdQF-0006xt-8O for guix-patches@gnu.org; Sun, 05 Feb 2023 06:43:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOdQF-0006Ng-4d for guix-patches@gnu.org; Sun, 05 Feb 2023 06:43:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59056] [PATCH v2 3/3] gnu: Add glad-2. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Feb 2023 11:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59056 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59056@debbugs.gnu.org Cc: "\(" Received: via spool by 59056-submit@debbugs.gnu.org id=B59056.167559737824504 (code B ref 59056); Sun, 05 Feb 2023 11:43:03 +0000 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:42:58 +0000 Received: from localhost ([127.0.0.1]:44182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQA-0006N5-7w for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:58 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQ3-0006MY-QO for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:55 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 330B740EA7; Sun, 5 Feb 2023 12:42:51 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oMzMtJkaDR_b; Sun, 5 Feb 2023 12:42:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597369; bh=Bz/gz8OJ68U9bYwIJrTTZEhvhVzFwYUA+Ac/XDAydEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BLfOyhNvEEicmTxAXsYoUTFRe591OrzyIIdQnG5bRr2ELszx2SPuHrSh1JZ+SYbLr Dl11wRS5AwwZSSQTyfjaEH0bDxj432izq+2NgJIxQuPYZI5LyYZKQi94eITB8s4+rD nnrui/WfuvsR7NWU6ngTDwsRl49sIvwLqAgQ1lrGnkcp1x3AHyFXOJ/QzYewCnZGcu WdauCUDJtYRUK0kLeHKC5KmMA4jvvUafweFLfmEY4s0b3d0GH66ut0ub3paACJVNWO dxteyyO9LreXszX6ienCGW63RQIqYThzgK3qdq1aXTSBrx1hFnjELEuEcV1k8v5tkR rBnlY2oV86VmA== Date: Sun, 5 Feb 2023 11:42:41 +0000 Message-Id: <20230205114241.4370-3-paren@disroot.org> In-Reply-To: <20230205114241.4370-1-paren@disroot.org> References: <20230205114241.4370-1-paren@disroot.org> 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" 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-2): New variable. (glad-1): Inherit from GLAD-2. (glad): Define as GLAD-2. --- gnu/packages/gl.scm | 69 ++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c5c3f63aed..c23b00bf70 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -190,39 +190,62 @@ (define-public ftgl Polygon meshes, and Extruded polygon meshes.") (license license:x11))) -(define-public glad-1 +(define-public glad-2 (package (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")))) + (version "2.0.2") + (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 + "1s9l7ypdxqaqpgnvc1vjgc7zaazm0j7dbfyqw6hwbx99d2whb7ds")))) (build-system python-build-system) (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 _ + (install-file "cmake/CMakeLists.txt" + (string-append #$output "/share/glad"))))))) + (native-inputs (list python-jinja2)) (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 glad-1) +(define-public glad-1 + (package + (inherit glad-2) + (name "glad") + (version "0.1.36") + (source (origin + (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")))) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-cmakelists.txt + (lambda _ + (install-file "CMakeLists.txt" + (string-append + #$output "/share/glad"))))))))) + +(define-public glad glad-2) (define-public s2tc (package