andreas pushed a commit to branch python-team
in repository guix.
commit e41b91bfb2ee26a91d13511528d229f8c64a3ef6
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Tue Apr 8 20:49:05 2025 +0100
gnu: glm: Update to 1.0.1.
* gnu/packages/maths.scm (glm): Update to 1.0.1. Apply a list style.
[source]: Switch to git-fetch.
[arguments] <phases>: Remove 'set-environment as
<https://github.com/g-truc/glm/pull/1087> is resolved. Use default
'install as <https://github.com/g-truc/glm/pull/968> is resolved.
Add 'post-install.
Change-Id: Ibda3768102ac94f6ef69057bfccd8716f7f91d0e
---
gnu/packages/maths.scm | 57 ++++++++++++++++++++------------------------------
1 file changed, 23 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index de9dd1ba88..0d040dac34 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7202,50 +7202,39 @@ with C89.")
(define-public glm
(package
(name "glm")
- (version "0.9.9.8")
+ (version "1.0.1")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://github.com/g-truc/glm/releases/download/";
- version "/glm-" version ".zip"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/g-truc/glm";)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0k6yk9v46h690rshdx49x98y5qspkzibld1wb51jwcm35vba7qip"))))
+ (base32 "0890rvv3czi3nqj11dc2m3wcdfv0dm0nr63wfcpfikk9sk6b4w8s"))))
(build-system cmake-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'set-environment
- (lambda _
- ;; Pass "-fno-ipa-modref" flag to the compiler to work
- ;; around a test failure with GCC 11. This is a
- ;; header-only library so these flags only affect tests.
- ;; See <https://github.com/g-truc/glm/pull/1087>.
- (setenv "CXXFLAGS" "-O2 -g -fno-ipa-modref")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- ;; Since version 0.9.9.6, 'make install' is not supported
- ;; and we have to do it "manually". Upstream discussion:
- ;; <https://github.com/g-truc/glm/pull/968>.
- (let* ((source (string-append "../glm"))
- (out (assoc-ref outputs "out"))
- (inc (string-append out "/include"))
- (lib (string-append out "/lib"))
- (pkgconfig (string-append lib "/pkgconfig")))
- (with-directory-excursion source
- (mkdir-p inc)
- (mkdir-p pkgconfig)
- (copy-recursively "glm" (string-append inc "/glm"))
- (copy-recursively "cmake" (string-append lib
"/cmake"))
- (call-with-output-file (string-append pkgconfig
"/glm.pc")
- (lambda (port)
- (format port
- "prefix=~a
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'post-install
+ (lambda _
+ (let* ((doc (string-append #$output "/share/doc/glm"))
+ (pkgconfig (string-append #$output "/lib/pkgconfig")))
+ (mkdir-p doc)
+ (mkdir-p pkgconfig)
+ (copy-recursively "../source/doc/api" (string-append doc
"/html"))
+ (install-file "../source/doc/manual.pdf" doc)
+ (call-with-output-file (string-append pkgconfig "/glm.pc")
+ (lambda (port)
+ (format port
+ "prefix=~a
includedir=${prefix}/include
Name: GLM
Description: OpenGL Mathematics
Version: ~a
-Cflags: -I${includedir}~%" out ,(version-prefix version 3)))))
- #t))))))
+Cflags: -I${includedir}~%" #$output #$version)))))))))
(native-inputs
(list unzip))
(home-page "https://glm.g-truc.net/";)
