unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sisiutl <sisiutl@egregore.fun>
To: 74443@debbugs.gnu.org
Cc: Sisiutl <sisiutl@egregore.fun>
Subject: [bug#74443] [PATCH] gnu: python-pyopengl: Add support for additional GL platforms.
Date: Wed, 20 Nov 2024 12:32:10 +0100	[thread overview]
Message-ID: <20241120113213.18100-1-sisiutl@egregore.fun> (raw)

* 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





                 reply	other threads:[~2024-11-20 11:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20241120113213.18100-1-sisiutl@egregore.fun \
    --to=sisiutl@egregore.fun \
    --cc=74443@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).