Subject: [PATCH 44/73] move libgl provider from mesa to libglvnd+mesa

From: The Man <[email-masked]>
Date: Sun, 24 Nov 2024 21:41:37 -0600

Change-Id: Ib02f8c469979adbbf20f2872e50ebc175a777380
---
 gnu/packages/python-graphics.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index 403a3c3b34..8ed16ef70b 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -61,21 +61,21 @@ (define-public python-glcontext
         #~(modify-phases %standard-phases
             (add-before 'build 'fix-lib-paths
               (lambda* (#:key inputs outputs #:allow-other-keys)
-                (let ((mesa (assoc-ref inputs "mesa"))
+                (let ((libgl (assoc-ref inputs "libgl"))
                       (libx11 (assoc-ref inputs "libx11")))
                   (substitute* '("glcontext/x11.cpp"
                                  "glcontext/egl.cpp")
                     (("\"libGL.so\"")
-                     (string-append "\"" mesa "/lib/libGL.so\""))
+                     (string-append "\"" libgl "/lib/libGL.so\""))
                     (("\"libEGL.so\"")
-                     (string-append "\"" mesa "/lib/libEGL.so\""))
+                     (string-append "\"" libgl "/lib/libEGL.so\""))
                     (("\"libX11.so\"")
                      (string-append "\"" libx11 "/lib/libX11.so\"")))
                   (substitute* '("glcontext/__init__.py")
                     (("find_library\\('GL'\\)")
-                     (string-append "'" mesa "/lib/libGL.so'"))
+                     (string-append "'" libgl "/lib/libGL.so'"))
                     (("find_library\\('EGL'\\)")
-                     (string-append "'" mesa "/lib/libEGL.so'"))
+                     (string-append "'" libgl "/lib/libEGL.so'"))
                     (("find_library\\(\"X11\"\\)")
                      (string-append "'" libx11 "/lib/libX11.so'"))))))
             (add-before 'check 'prepare-test-environment
@@ -84,7 +84,7 @@ (define-public python-glcontext
                 (setenv "DISPLAY" ":1"))))))
       (inputs
        (list libx11
-             mesa))
+             libgl))
       (native-inputs
        (list python-psutil
              python-pytest
@@ -157,7 +157,7 @@ (define-public python-pyglet
                                  "pyglet/media/drivers/openal/lib_openal.py"
                                  "pyglet/media/drivers/pulse/lib_pulseaudio.py")
                 (("'EGL'")
-                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                 (format #f "'~a/~a'" #$(this-package-input "libgl")
                          "lib/libEGL.so"))
                 (("\"fontconfig\"")
                  (format #f "'~a/~a'" #$(this-package-input "fontconfig-minimal")
@@ -166,7 +166,7 @@ (define-public python-pyglet
                  (format #f "'~a/~a'" #$(this-package-input "freetype")
                          "lib/libfreetype.so"))
                 (("'GL'")
-                 (format #f "'~a/~a'" #$(this-package-input "mesa")
+                 (format #f "'~a/~a'" #$(this-package-input "libgl")
                          "lib/libGL.so"))
                 (("'GLU'")
                  (format #f "'~a/~a'" #$(this-package-input "glu")
@@ -223,7 +223,7 @@ (define-public python-pyglet
            libxext
            libxinerama
            libxxf86vm
-           mesa
+           libgl
            openal
            pulseaudio))
     (home-page "https://github.com/pyglet/pyglet")
-- 
2.46.0