GNU bug report logs - #74443
[PATCH] gnu: python-pyopengl: Add support for additional GL platforms.

Previous Next

Full log

View this message in rfc822 format

From: Sisiutl <sisiutl <at> egregore.fun>
To: 74443 <at> debbugs.gnu.org
Cc: Sisiutl <sisiutl <at> egregore.fun>
Subject: [bug#74443] [PATCH] gnu: python-pyopengl: Add support for additional GL platforms.
Date: Wed, 20 Nov 2024 12:32:10 +0100

* gnu/packages/python-xyz.scm (python-pyopengl)[arguments]:
Fix paths for non-GLX platforms too.

Change-Id: Ib50d5c64ff73079c4ffa3bd3e03012a66591ddfc
---
 gnu/packages/python-xyz.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5083473c08..04af924a71 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25706,18 +25706,18 @@ (define-public python-pyopengl
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* '("OpenGL/platform/ctypesloader.py")
                (("filenames_to_try = \\[\\]") "filenames_to_try = [name]"))
-             (substitute* '("OpenGL/platform/glx.py" "tests/check_glut_load.py")
-               (("'GL'")
-                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGL.so'"))
+             (substitute* '("OpenGL/platform/glx.py"
+                            "OpenGL/platform/egl.py"
+                            "OpenGL/platform/osmesa.py"
+                            "OpenGL/platform/darwin.py"
+                            "tests/check_glut_load.py")
                (("'GLU'")
                 (string-append "'" (assoc-ref inputs "glu") "/lib/libGLU.so'"))
                (("'glut',")
                 (string-append "'" (assoc-ref inputs "freeglut") "/lib/libglut.so',"))
-               (("'GLESv1_CM'")
-                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv1_CM.so'"))
-               (("'GLESv2'")
-                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'")))
-               ;; Not providing libgle. It seems to be very old.
+               (("'(GL|EGL|GLESv1_CM|GLESv2|OSMesa)'" all gl-library)
+                (string-append "'" (assoc-ref inputs "mesa") (string-append "/lib/lib" gl-library ".so'"))))
+             ;; Not providing libgle. It seems to be very old.
              #t)))))
     (home-page "https://pyopengl.sourceforge.net")
     (synopsis "Standard OpenGL bindings for Python")
-- 
2.46.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.