From: Simon Tournier <zimon.toutoune@gmail.com>
To: 66013@debbugs.gnu.org
Cc: Simon Tournier <zimon.toutoune@gmail.com>
Subject: [bug#66013] [PATCH 3/4] gnu: python-glcontext: Update to 2.4.0-0.beebc1f.
Date: Fri, 15 Sep 2023 21:10:39 +0200 [thread overview]
Message-ID: <375535045b489ea3432fe79940db0f36d18021aa.1694800551.git.zimon.toutoune@gmail.com> (raw)
In-Reply-To: <cover.1694800551.git.zimon.toutoune@gmail.com>
* gnu/packages/python-xyz.scm (python-glcontext): Explicitly refer to commit
instead of mutable Git tag.
---
gnu/packages/python-xyz.scm | 100 +++++++++++++++++++-----------------
1 file changed, 52 insertions(+), 48 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2230310a0350..481326b8e162 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -22986,55 +22986,59 @@ (define-public python-pyopengl-accelerate
"This is the Cython-coded accelerator module for PyOpenGL.")))
(define-public python-glcontext
- (package
- (name "python-glcontext")
- (version "2.4.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/moderngl/glcontext")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac"))))
- (build-system pyproject-build-system)
- (arguments
- (list #:phases #~(modify-phases %standard-phases
- (add-before 'build 'fix-lib-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((mesa (assoc-ref inputs "mesa"))
- (libx11 (assoc-ref inputs "libx11")))
- (substitute* '("glcontext/x11.cpp"
- "glcontext/egl.cpp")
- (("\"libGL.so\"")
- (string-append "\"" mesa "/lib/libGL.so\""))
- (("\"libEGL.so\"")
- (string-append "\"" mesa "/lib/libEGL.so\""))
- (("\"libX11.so\"")
- (string-append "\"" libx11 "/lib/libX11.so\"")))
- (substitute* '("glcontext/__init__.py")
- (("find_library\\('GL'\\)")
- (string-append "'" mesa "/lib/libGL.so'"))
- (("find_library\\('EGL'\\)")
- (string-append "'" mesa "/lib/libEGL.so'"))
- (("find_library\\(\"X11\"\\)")
- (string-append "'" libx11 "/lib/libX11.so'"))))))
- (replace 'check
- (lambda* (#:key inputs outputs tests?
- #:allow-other-keys)
- (when tests?
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "tests")))))))
- (inputs (list libx11 mesa))
- (native-inputs (list xorg-server-for-tests python-pytest python-psutil))
- (home-page "https://github.com/moderngl/glcontext")
- (synopsis "Portable OpenGL Context for ModernGL")
- (description "Python-glcontext is a library providing an OpenGL
+ (let (;; Upstream is known for abusing mutable tag, hence pinpoint the
+ ;; relevant commit.
+ (revision "0")
+ (commit "beebc1fd08ee850f06f4390be4b280824e383074"))
+ (package
+ (name "python-glcontext")
+ (version (git-version "2.4.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/moderngl/glcontext")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0zzpwyqg19y600n09xz07cxk4jimh9vjraszda7g7ipijq6iasac"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'build 'fix-lib-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((mesa (assoc-ref inputs "mesa"))
+ (libx11 (assoc-ref inputs "libx11")))
+ (substitute* '("glcontext/x11.cpp"
+ "glcontext/egl.cpp")
+ (("\"libGL.so\"")
+ (string-append "\"" mesa "/lib/libGL.so\""))
+ (("\"libEGL.so\"")
+ (string-append "\"" mesa "/lib/libEGL.so\""))
+ (("\"libX11.so\"")
+ (string-append "\"" libx11 "/lib/libX11.so\"")))
+ (substitute* '("glcontext/__init__.py")
+ (("find_library\\('GL'\\)")
+ (string-append "'" mesa "/lib/libGL.so'"))
+ (("find_library\\('EGL'\\)")
+ (string-append "'" mesa "/lib/libEGL.so'"))
+ (("find_library\\(\"X11\"\\)")
+ (string-append "'" libx11 "/lib/libX11.so'"))))))
+ (replace 'check
+ (lambda* (#:key inputs outputs tests?
+ #:allow-other-keys)
+ (when tests?
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ (add-installed-pythonpath inputs outputs)
+ (invoke "pytest" "tests")))))))
+ (inputs (list libx11 mesa))
+ (native-inputs (list xorg-server-for-tests python-pytest python-psutil))
+ (home-page "https://github.com/moderngl/glcontext")
+ (synopsis "Portable OpenGL Context for ModernGL")
+ (description "Python-glcontext is a library providing an OpenGL
implementation for ModernGL on multiple platforms.")
- (license license:expat)))
+ (license license:expat))))
(define-public python-rencode
(package
--
2.38.1
next prev parent reply other threads:[~2023-09-15 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 18:38 [bug#66013] [PATCH 0/4] gnu: bap, python-glcontext: Fix hash and update Simon Tournier
2023-09-15 19:10 ` [bug#66013] [PATCH 1/4] gnu: bap: Update to 2.5.0-alpha-0.a972f8a Simon Tournier
2023-09-15 19:10 ` [bug#66013] [PATCH 2/4] gnu: bap: Update to 2.6.0-alpha-0.f995d28 Simon Tournier
2023-09-15 19:10 ` Simon Tournier [this message]
2023-09-15 19:10 ` [bug#66013] [PATCH 4/4] gnu: python-glcontext: Update to 2.4.0-1.0af21b7 Simon Tournier
2023-09-22 14:00 ` bug#66013: [PATCH 0/4] gnu: bap, python-glcontext: Fix hash and update Simon Tournier
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=375535045b489ea3432fe79940db0f36d18021aa.1694800551.git.zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=66013@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).