all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "\( via Guix-patches" via <guix-patches@gnu.org>
To: 59056@debbugs.gnu.org
Cc: "\(" <paren@disroot.org>
Subject: [bug#59056] [PATCH v3 3/3] gnu: Add glad-2.
Date: Sun,  5 Feb 2023 11:48:54 +0000	[thread overview]
Message-ID: <20230205114854.5212-3-paren@disroot.org> (raw)
In-Reply-To: <20230205114854.5212-1-paren@disroot.org>

* 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





      parent reply	other threads:[~2023-02-05 11:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-05 17:14 [bug#59056] [PATCH 0/3] gnu: Add glad-2 ( via Guix-patches via
2022-11-05 17:15 ` [bug#59056] [PATCH 1/3] gnu: glad: Rename to GLAD-1 ( via Guix-patches via
2022-11-05 17:15   ` [bug#59056] [PATCH 2/3] gnu: openboardview: Pin " ( via Guix-patches via
2022-11-05 17:15   ` [bug#59056] [PATCH 3/3] gnu: Add glad-2 ( via Guix-patches via
2023-02-05 11:42 ` [bug#59056] [PATCH v2 1/3] gnu: glad: Rename to GLAD-1 ( via Guix-patches via
2023-02-05 11:42   ` [bug#59056] [PATCH v2 2/3] gnu: openboardview: Pin " ( via Guix-patches via
2023-02-05 11:42   ` [bug#59056] [PATCH v2 3/3] gnu: Add glad-2 ( via Guix-patches via
2023-02-05 11:48 ` [bug#59056] [PATCH v3 1/3] gnu: glad: Rename to GLAD-1 ( via Guix-patches via
2023-02-05 11:48   ` [bug#59056] [PATCH v3 2/3] gnu: openboardview: Pin " ( via Guix-patches via
2023-02-05 11:48   ` ( via Guix-patches via [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230205114854.5212-3-paren@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=59056@debbugs.gnu.org \
    --cc=paren@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.