From unknown Fri Jun 20 07:25:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59056 <59056@debbugs.gnu.org> To: bug#59056 <59056@debbugs.gnu.org> Subject: Status: [PATCH 0/3] gnu: Add glad-2. Reply-To: bug#59056 <59056@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:25:50 +0000 retitle 59056 [PATCH 0/3] gnu: Add glad-2. reassign 59056 guix-patches submitter 59056 "(" severity 59056 normal tag 59056 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 13:14:46 2022 Received: (at submit) by debbugs.gnu.org; 5 Nov 2022 17:14:46 +0000 Received: from localhost ([127.0.0.1]:57918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMkn-0000Pl-VI for submit@debbugs.gnu.org; Sat, 05 Nov 2022 13:14:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:43576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMkj-0000PX-Jp for submit@debbugs.gnu.org; Sat, 05 Nov 2022 13:14:44 -0400 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 1orMkh-0005Sz-Gz for guix-patches@gnu.org; Sat, 05 Nov 2022 13:14:39 -0400 Received: from knopi.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1orMke-00071F-Ut for guix-patches@gnu.org; Sat, 05 Nov 2022 13:14:39 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 32BB541275; Sat, 5 Nov 2022 18:14:33 +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 NMsqCND42qUC; Sat, 5 Nov 2022 18:14:32 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667668472; bh=921DWdFJ8jZHtRBLpO+3hLfY5w69gM9XqsL3VOpPKXs=; h=From:To:Cc:Subject:Date:From; b=ZkvA+JmHz1jjtE7dCgwsgRAjavM0ZWhDPOw+yQJyQw9QZjZQf/avEan9ZfeTDK41u Og5caF15onJWVYpyoRd7hJW+rAOJF358rO3KKXASwld4i8Q0SBi/ItEWBeA2LHjYh3 bzNkE/imUnQU+ryQzGMIYslnjrOBlrM8j5ciCjCBwuDKpBQoSTIHojFbQIyz6+KqyS ryJtQXlwzWvqCrQA3Sn09xSXhZDY4xejYY7g04YbY4dk8qiC2BbwkQOM1UHaVjTkLp V1oUYyze2M6IZf+eMJ3OANGj3SpHYkpZH/6qQ5jSdVVn3geVPILXIQ7Rz8LCgQwZmE 60zZSzKcHSUWQ== To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: Add glad-2. Date: Sat, 5 Nov 2022 17:14:27 +0000 Message-Id: <20221105171427.17117-1-paren@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Heya, This patchset supersedes #56959. It adds the newly released version 2 of the GLAD OpenGL and Vulkan API generator. ( (3): gnu: glad: Rename to GLAD-1. gnu: openboardview: Pin to GLAD-1. gnu: Add glad-2. gnu/packages/electronics.scm | 3 +- gnu/packages/gl.scm | 70 ++++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 23 deletions(-) base-commit: 3e259442e70eae0cee6d4ce67c2d2dab939b0eb7 -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 13:15:55 2022 Received: (at 59056) by debbugs.gnu.org; 5 Nov 2022 17:15:55 +0000 Received: from localhost ([127.0.0.1]:57925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMlv-0000SR-Ad for submit@debbugs.gnu.org; Sat, 05 Nov 2022 13:15:55 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMls-0000S4-OD for 59056@debbugs.gnu.org; Sat, 05 Nov 2022 13:15:54 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4C2A44128C; Sat, 5 Nov 2022 18:15: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 RcryW_z8vaVN; Sat, 5 Nov 2022 18:15:50 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667668550; bh=jalEY6b8ko3gJ7QQYlrv0NrOCAf7xPLGkLcQfQyaKVI=; h=From:To:Cc:Subject:Date:From; b=OLudSUyKpS9EYdPu7mR6gtDC/ii1k5e1HXF+CUYRRJaxf2r/iF4tsp9dhPgaCp9tD 2gWzKvPjEOdeXBYSnIJm1diCAvE03eHLY8+1IEf3chKmEBGYUBsTbLyHvzavphazOi FW5TCVJDZLKatEKNKJ5jsRAzhzNWyfmiGqXykiyYaOKxsMrisoxVvGam1YUYspJ6HM 7r42jc3rfnvJnpu7cznbUamXn6D4CsmYuBdKpXT4h9SzTKHMF8nKK+PH5pKoT4Ne4s ciXq5MZ1gS1tr2hHH2vkSOVnQLwYBjg0/njtmd6Ws9lJfS5GdIkPJHvHelQA0ou8HA TkonPAfit08zg== To: 59056@debbugs.gnu.org Subject: [PATCH 1/3] gnu: glad: Rename to GLAD-1. Date: Sat, 5 Nov 2022 17:15:40 +0000 Message-Id: <20221105171542.19571-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gl.scm (glad-1): New variable. (glad): Define as GLAD-1. --- gnu/packages/gl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 68c751ace5..93524988a9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * gnu/packages/gl.scm (glad-1): New variable. (glad): Define as GLAD-1. --- gnu/packages/gl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 68c751ace5..93524988a9 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,7 +190,7 @@ (define-public ftgl Polygon meshes, and Extruded polygon meshes.") (license license:x11))) -(define-public glad +(define-public glad-1 (package (name "glad") (version "0.1.36") @@ -221,6 +222,8 @@ (define-public glad generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (license license:expat))) +(define glad glad-1) + (define-public s2tc (package (name "s2tc") -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 13:15:57 2022 Received: (at 59056) by debbugs.gnu.org; 5 Nov 2022 17:15:57 +0000 Received: from localhost ([127.0.0.1]:57927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMlw-0000SZ-PG for submit@debbugs.gnu.org; Sat, 05 Nov 2022 13:15:56 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMls-0000S6-Ns for 59056@debbugs.gnu.org; Sat, 05 Nov 2022 13:15:54 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9B0E04127B; Sat, 5 Nov 2022 18:15: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 Z8KfaL_WYZ7Y; Sat, 5 Nov 2022 18:15:50 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667668550; bh=3Jjhz0KPvO80EZj5ektmDIlkzsqtef+rg/pdpy8CIJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2zKhHnfHskz/MQIC/OqagR+Q3bS3UsmCSIcbIFuWiAUH9vwV4u8uPOt8DDUpuXd5 MAZJmug8ahemCX8RuQmRP9c4/KCVSJAFDd2hP26ox5Qt+zNx5uxA+eIqWdj2cPeM6w R2tGNvlv7wlbGhzc3CD2pN9A2+H9qzWeYSzyrI2GKwTG1Rc3q+gFVmAJk/oRnIJZSA K9zThGsGukz8bOIsvdDTuNwL4rFvwaqU+lk9j984pbmqj+YAHfFyo/DdIbwGT0NIWc U4NGgx1/qhhe2J10pJvWoT9DTKR07e/zw5W1JUGvtfaT2WfrqUXRhiJJrD7R4X3yA+ 9YVWNK388wmow== To: 59056@debbugs.gnu.org Subject: [PATCH 2/3] gnu: openboardview: Pin to GLAD-1. Date: Sat, 5 Nov 2022 17:15:41 +0000 Message-Id: <20221105171542.19571-2-paren@disroot.org> In-Reply-To: <20221105171542.19571-1-paren@disroot.org> References: <20221105171542.19571-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/electronics.scm (openboardview): Pin to GLAD-1. --- gnu/packages/electronics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 15e7318926..c10177eb18 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -5,6 +5,7 @@ ;;; C [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * gnu/packages/electronics.scm (openboardview): Pin to GLAD-1. --- gnu/packages/electronics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 15e7318926..c10177eb18 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 Maxim Cournoyer +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -321,7 +322,7 @@ (define keep (list "." ".." "openboardview")) (native-inputs (list pkg-config python - glad + glad-1 stb-image utf8-h)) (inputs -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 05 13:16:09 2022 Received: (at 59056) by debbugs.gnu.org; 5 Nov 2022 17:16:09 +0000 Received: from localhost ([127.0.0.1]:57929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMlx-0000Sb-0u for submit@debbugs.gnu.org; Sat, 05 Nov 2022 13:16:09 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1orMlt-0000S7-0A for 59056@debbugs.gnu.org; Sat, 05 Nov 2022 13:15:54 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5195E41275; Sat, 5 Nov 2022 18:15:52 +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 QXOzia9o_3aR; Sat, 5 Nov 2022 18:15:50 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667668550; bh=Q5qBr+DJbq2evaNVvnActBEq+f9ve7wInTsXNrj9KCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GrFRE7DdKTbi9inZUWpq/QiH3pmCkTiumhyc/Ou0vrffL/8Cd3QrGlkIxRd6XFTGA nS2kAvhfxE/ZvLZo+uerNVu0ogdfchB/1nYUifvmRYi3rNkjIGnx/NWZ4mGym3nxpW bY4vGvStpE6ZGVHjlBsv6mEzkus+pSAc82lQOZxAXBmdDuqxASnOz3NpoI3XQehPpd +sGBlpGPwvvoj6+2+sSexA8qHvDlOXnnemZ5Oygw8SvvrSDYFt/jT97qyHQIg7/epf AkIFwqshboz7yKczaKVH0E9xV/3az+AQ1u4ud92KSAYvv6GO4XYIt10e3Mx0x+fKrE d9PwEeUj9Bbbw== To: 59056@debbugs.gnu.org Subject: [PATCH 3/3] gnu: Add glad-2. Date: Sat, 5 Nov 2022 17:15:42 +0000 Message-Id: <20221105171542.19571-3-paren@disroot.org> In-Reply-To: <20221105171542.19571-1-paren@disroot.org> References: <20221105171542.19571-1-paren@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 ins [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 FROM_ONE_CHAR Bogus FROM name -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * 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 93524988a9..7a6e8d092c 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 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 glad glad-2) (define-public s2tc (package -- 2.38.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:42:57 2023 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:42:58 +0000 Received: from localhost ([127.0.0.1]:44178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQ7-0006Mo-5r for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:57 -0500 Received: from knopi.disroot.org ([178.21.23.139]:56936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQ1-0006MS-WD for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:54 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4D5E64129B; Sun, 5 Feb 2023 12:42:48 +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 9YnP-t5mCMOn; Sun, 5 Feb 2023 12:42:47 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597367; bh=R6nKaPjE9xpGoWXESA3frYVCKqAPBjq4VLlZY/JSVoU=; h=From:To:Cc:Subject:Date; b=EQiyIgT9epceTaULkCYmjjBYwHCD/0ge5kVTnhTq1RHb/akY8ax4+NuvEe8tbXXC/ AT8Jcf/yZRHdksnvTRA9CseEthr8xTxvuruIPQXsAjf5xDZFuws05Q8CiFWrNMLudQ V17S8UFpSG1aThaA3paJ+E7XsVH1qpqw8Hp3vhWTGB2ajh5mTxw0LEit+wR/PDebKI AaNmh+RosdWdi/Yj73DKxgLqCZDVTpOJKWAUpbsdUptgGy1kC5eZt9HpmdzumTcftC p5MgP4+cYvb8d6lgWp7FvGVm85icC9NkqGKXSKODyhniGYp42fFasaQvKbh5nLzlZL t+fXlj2+qmPhw== To: 59056@debbugs.gnu.org Subject: [PATCH v2 1/3] gnu: glad: Rename to GLAD-1. Date: Sun, 5 Feb 2023 11:42:39 +0000 Message-Id: <20230205114241.4370-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glad-1): New variable. (glad): Define as GLAD-1. --- gnu/packages/gl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01ab6135a4..c5c3f63aed 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,7 +190,7 @@ (define-public ftgl Polygon meshes, and Extruded polygon meshes.") (license license:x11))) -(define-public glad +(define-public glad-1 (package (name "glad") (version "0.1.36") @@ -221,6 +222,8 @@ (define-public glad generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (license license:expat))) +(define-public glad glad-1) + (define-public s2tc (package (name "s2tc") base-commit: f912d5c740815bff89a70d54b592c6173519003c -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:42:58 2023 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:42:58 +0000 Received: from localhost ([127.0.0.1]:44180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQ9-0006Mx-T1 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:58 -0500 Received: from knopi.disroot.org ([178.21.23.139]:57390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdQ3-0006MW-5D for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:42:54 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 718BF413D9; Sun, 5 Feb 2023 12:42:50 +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 lOrf7EzC0bxW; Sun, 5 Feb 2023 12:42:49 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597369; bh=9Mqp6apjWuIBv2BYk2jEaX7W2T/8qe3BbW9JOHBJNgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SuckJnPSnnnNiHqD0qTqk7h5fvKzwv2IHDpS/Xh6wGUGp7iSsbhllqygVunNARXG+ wln8EEZkivSz2Dy7F9Ktz8C7TC9Vk82jNB02J1S/MGazghexVQwqoQAHXEVS+Xf9VX H+0OuU8Dpz8usO/qbU/rRDxDuAM7kDy+cpp8ZGt7Ba74q1UbTcnwspq/vEjDZPuYXu TU/vNl/dwgaKlwixw4/CSOioL+D3IzLvyMmHkkwokXEUG5jOvCbph/B8WUT5m33JgR aKXp/xOAbzY3W92HcVZ36iig8i6d+Au820sNCFxWrUH0Ke++qb13PjLfdfRSEoTWT2 kYQ7G/5qmsfIA== To: 59056@debbugs.gnu.org Subject: [PATCH v2 2/3] gnu: openboardview: Pin to GLAD-1. Date: Sun, 5 Feb 2023 11:42:40 +0000 Message-Id: <20230205114241.4370-2-paren@disroot.org> In-Reply-To: <20230205114241.4370-1-paren@disroot.org> References: <20230205114241.4370-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/electronics.scm (openboardview): Pin to GLAD-1. --- gnu/packages/electronics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 15e7318926..c10177eb18 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 Maxim Cournoyer +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -321,7 +322,7 @@ (define keep (list "." ".." "openboardview")) (native-inputs (list pkg-config python - glad + glad-1 stb-image utf8-h)) (inputs -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:42:58 2023 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) From: "(" 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== To: 59056@debbugs.gnu.org Subject: [PATCH v2 3/3] gnu: Add glad-2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:49:00 2023 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:49:00 +0000 Received: from localhost ([127.0.0.1]:44196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdW0-0006ar-F2 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:49:00 -0500 Received: from knopi.disroot.org ([178.21.23.139]:44054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdVx-0006aW-Ni for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:48:58 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 18A104134D; Sun, 5 Feb 2023 12:48:57 +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 WIWvMhM5E8le; Sun, 5 Feb 2023 12:48:56 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597736; bh=R6nKaPjE9xpGoWXESA3frYVCKqAPBjq4VLlZY/JSVoU=; h=From:To:Cc:Subject:Date; b=CYTyvsjqHOp0zLCL5q4iFW2T5pFuWSZt9+40PNFSU6HtUVQR6ulrT9oUmUTB2ou0W jHj2fYPzEdhGq+a5XsoMcBTDUBW+xT9FNoPM51sxgp/C5G5/2nk9I726kb8KVV+9st z/UCvE8fr+0HVq7QrL2dMUee8b/1nmLrRluo4UOuXxsDDd9rGaSDakEDwH+XKrtZji 4ncSwMAEbnPB2X3+9gD/3RsCBXek4T78HWIJ7Nx83CO/0UuC8HpCcjBG9vLgKvdoJ+ tp1GmviOuM3HTbdAZraJPF+g9CFE4au3n/W0MMrp++x3rlHYKAhQPdJTYQW+H9klp1 khS6roMyTx81g== To: 59056@debbugs.gnu.org Subject: [PATCH v3 1/3] gnu: glad: Rename to GLAD-1. Date: Sun, 5 Feb 2023 11:48:52 +0000 Message-Id: <20230205114854.5212-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glad-1): New variable. (glad): Define as GLAD-1. --- gnu/packages/gl.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 01ab6135a4..c5c3f63aed 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,7 +190,7 @@ (define-public ftgl Polygon meshes, and Extruded polygon meshes.") (license license:x11))) -(define-public glad +(define-public glad-1 (package (name "glad") (version "0.1.36") @@ -221,6 +222,8 @@ (define-public glad generate a GL/GLES/EGL/GLX/WGL loader tailored for specific requirements.") (license license:expat))) +(define-public glad glad-1) + (define-public s2tc (package (name "s2tc") base-commit: f912d5c740815bff89a70d54b592c6173519003c -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:49:01 2023 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:49:01 +0000 Received: from localhost ([127.0.0.1]:44198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdW0-0006at-QK for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:49:01 -0500 Received: from knopi.disroot.org ([178.21.23.139]:44396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdVy-0006aY-Oa for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:48:59 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1B41F413A0; Sun, 5 Feb 2023 12:48:58 +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 ygZK701zozpc; Sun, 5 Feb 2023 12:48:57 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597737; bh=9Mqp6apjWuIBv2BYk2jEaX7W2T/8qe3BbW9JOHBJNgQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Wb2PK2DdbTTqbuo2eJaVty2tZDBbRRK7e2a1s+lb/ZZH6vdogJAb4j/+ZAhmXvp9Y mUo9imd+UwK2WzhXa+9TqiHyfSi7Yf+ygl1iIPmJKWKQa4yhJ3Qs48SsEqgMGTqXBe TrsJFkVKQArJFgo+1PKfnd0/+rp0NGqk+WqY3qe/YaHdMBkGJqTtPT+WiujwmVDJhi EPNeK1ZsNm7yk7G0+dVtOjoZinocUEDk5NV9I+eYn1ECkpj/OZXi17On0X3ue5+FJ+ GMimT0bg+tbBCeCJ0yh3zGbp3sO0RtOl+fBHpleTr79EQic5M0lR3Au6KY609lyGQX dPUDsffQeg4cw== To: 59056@debbugs.gnu.org Subject: [PATCH v3 2/3] gnu: openboardview: Pin to GLAD-1. Date: Sun, 5 Feb 2023 11:48:53 +0000 Message-Id: <20230205114854.5212-2-paren@disroot.org> In-Reply-To: <20230205114854.5212-1-paren@disroot.org> References: <20230205114854.5212-1-paren@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/electronics.scm (openboardview): Pin to GLAD-1. --- gnu/packages/electronics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 15e7318926..c10177eb18 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 Maxim Cournoyer +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -321,7 +322,7 @@ (define keep (list "." ".." "openboardview")) (native-inputs (list pkg-config python - glad + glad-1 stb-image utf8-h)) (inputs -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 05 06:49:01 2023 Received: (at 59056) by debbugs.gnu.org; 5 Feb 2023 11:49:01 +0000 Received: from localhost ([127.0.0.1]:44200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdW1-0006b0-31 for submit@debbugs.gnu.org; Sun, 05 Feb 2023 06:49:01 -0500 Received: from knopi.disroot.org ([178.21.23.139]:44528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOdVz-0006af-Dk for 59056@debbugs.gnu.org; Sun, 05 Feb 2023 06:48:59 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B8B4A41301; Sun, 5 Feb 2023 12:48:58 +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 l51f0BAK1ujL; Sun, 5 Feb 2023 12:48:57 +0100 (CET) From: "(" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1675597737; bh=brL8JLDw+M782Jh5PxCrqtRWijg07voak4TV1yBEnpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O8efN64W4n2+8zUWLA2S8ywo6HoqeVn0Ouupu3fd5eITUI6II3zRigavcBKxz+Uw+ 0aw0x59myl8Fdv4kjJekWmMrFJrV+DBgCeZfSEgjjiIkuyk+Poq/eECHcbUEz61wHb Jfxg7i6QML1/V9g4PDj7psM3GK87fYrTwlCLCiu2ppo+Ul9vxAmF1luKo8RNryli5V 6CLhovzxcTMP3QCu+nxhMfYsS5FgZpQZAMCKOgFnHKSgKXnajk5Qhd0ADOsgr96FUP yra5IkV/vwy/CS+MweabQpYHws3V7cCqJLOiE+XFlhF07Hk1sP3XQXCATstjEsvmnE UWxV+ybWposEg== To: 59056@debbugs.gnu.org Subject: [PATCH v3 3/3] gnu: Add glad-2. Date: Sun, 5 Feb 2023 11:48:54 +0000 Message-Id: <20230205114854.5212-3-paren@disroot.org> In-Reply-To: <20230205114854.5212-1-paren@disroot.org> References: <20230205114854.5212-1-paren@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59056 Cc: "\(" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gl.scm (glad-2): New variable. (glad-1): Inherit from GLAD-2. (glad): Define as GLAD-2. --- gnu/packages/gl.scm | 68 ++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c5c3f63aed..195434f7c0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -190,39 +190,61 @@ (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 -- 2.39.1