From patchwork Sat Nov 5 17:15:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44340 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 239A927BBE9; Sat, 5 Nov 2022 17:20:16 +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 6D62327BBEA for ; Sat, 5 Nov 2022 17:20:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orMmC-0006NS-11; Sat, 05 Nov 2022 13:16:12 -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 1orMm2-00066f-PY for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:02 -0400 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 1orMm2-0007IO-HK for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orMm2-0000T8-BH for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59056] [PATCH 1/3] gnu: glad: Rename to GLAD-1. References: <20221105171427.17117-1-paren@disroot.org> In-Reply-To: <20221105171427.17117-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 17:16:02 +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.16676685551767 (code B ref 59056); Sat, 05 Nov 2022 17:16:02 +0000 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) 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== Date: Sat, 5 Nov 2022 17:15:40 +0000 Message-Id: <20221105171542.19571-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: , Sender: "Guix-patches" 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 X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Sat Nov 5 17:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44339 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 348DC27BBEA; Sat, 5 Nov 2022 17:19:14 +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=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 AB59F27BBE9 for ; Sat, 5 Nov 2022 17:19:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orMmC-0006OL-Ay; Sat, 05 Nov 2022 13:16:12 -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 1orMm3-00067z-5o for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:03 -0400 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 1orMm2-0007Ij-TV for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orMm2-0000TH-Oq for guix-patches@gnu.org; Sat, 05 Nov 2022 13:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59056] [PATCH 2/3] gnu: openboardview: Pin to GLAD-1. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 17:16:02 +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.16676685571776 (code B ref 59056); Sat, 05 Nov 2022 17:16:02 +0000 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) 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== 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 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: , Sender: "Guix-patches" 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 X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sat Nov 5 17:15:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44341 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 DEEBD27BBE9; Sat, 5 Nov 2022 17:51: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 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 68A6927BBEA for ; Sat, 5 Nov 2022 17:51:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1orMoy-0007eL-4r; Sat, 05 Nov 2022 13:19:04 -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 1orMn2-0006kX-1b for guix-patches@gnu.org; Sat, 05 Nov 2022 13:17:07 -0400 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 1orMn0-0007Q1-92 for guix-patches@gnu.org; Sat, 05 Nov 2022 13:17:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1orMn0-0000Uu-5E for guix-patches@gnu.org; Sat, 05 Nov 2022 13:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59056] [PATCH 3/3] gnu: Add glad-2. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Nov 2022 17:17:02 +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.16676685691841 (code B ref 59056); Sat, 05 Nov 2022 17:17:02 +0000 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) 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== 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 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: , Sender: "Guix-patches" 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 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 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