From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 67814@debbugs.gnu.org
Subject: [bug#67814] [PATCH 1/3] gnu: glad: Update to 2.0.4.
Date: Thu, 14 Dec 2023 00:57:36 +0800 [thread overview]
Message-ID: <2451c8b3511c2a3c20250fcfe690c59f7538e534.1702486251.git.zhengjunjie@iscas.ac.cn> (raw)
In-Reply-To: <cover.1702486251.git.zhengjunjie@iscas.ac.cn>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 4688 bytes --]
* 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 <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; 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 <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; 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")
--
2.41.0
next prev parent reply other threads:[~2023-12-13 17:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 16:53 [bug#67814] [PATCH 0/3] gnu: mpv: Update to 0.37.0 Zheng Junjie
2023-12-13 16:57 ` Zheng Junjie [this message]
2023-12-13 16:57 ` [bug#67814] [PATCH 2/3] gnu: libplacebo: Update to 6.338.1 Zheng Junjie
2023-12-13 16:57 ` [bug#67814] [PATCH 3/3] gnu: mpv: Update to 0.37.0 Zheng Junjie
2023-12-22 14:33 ` bug#67814: [PATCH 0/3] " Hilton Chain via Guix-patches via
2023-12-25 11:33 ` [bug#67814] " Andrew Tropin via Guix-patches via
2024-01-05 5:09 ` [bug#68044] bug#67814: " Hilton Chain via Guix-patches via
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=2451c8b3511c2a3c20250fcfe690c59f7538e534.1702486251.git.zhengjunjie@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=67814@debbugs.gnu.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.