Subject: [bug#74522] [PATCH 45/73] move libgl provider from mesa to libglvnd+mesa

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

Change-Id: I4a17476f9cb026896fd3b889ef356c64e42a6a7c
---
 gnu/packages/python-xyz.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ceb122e08d..3dad9f6570 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -22788,7 +22788,7 @@ (define-public python-kivy
      (list pkg-config python-cython))
     (inputs
      (list gstreamer
-           mesa
+           libgl
            (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))
            python-docutils
            python-kivy-garden
@@ -25757,7 +25757,7 @@ (define-public python-pyopengl
          "09syrsfrcknr1k2wmj05gfd5d0dyjfxzbipzbd0agv9775vwi9lf"))))
     (build-system python-build-system)
     (inputs
-     (list mesa freeglut glu))
+     (list libgl freeglut glu))
     (arguments
      `(#:tests? #f ; Tests fail: AttributeError: 'GLXPlatform' object has no
                                         ;attribute 'OSMesa'
@@ -25769,15 +25769,15 @@ (define-public python-pyopengl
                (("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'"))
+                (string-append "'" (assoc-ref inputs "libgl") "/lib/libGL.so'"))
                (("'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'"))
+                (string-append "'" (assoc-ref inputs "libgl") "/lib/libGLESv1_CM.so'"))
                (("'GLESv2'")
-                (string-append "'" (assoc-ref inputs "mesa") "/lib/libGLESv2.so'")))
+                (string-append "'" (assoc-ref inputs "libgl") "/lib/libGLESv2.so'")))
                ;; Not providing libgle. It seems to be very old.
              #t)))))
     (home-page "https://pyopengl.sourceforge.net")
@@ -25801,7 +25801,7 @@ (define-public python-pyopengl-accelerate
         (base32
          "1hydrpdn4p4z6mlczcg1y4s0z8si3rs6zq8x4ql558pcaq1312md"))))
     (inputs
-     (list mesa python-numpy)) ; for cython module
+     (list libgl python-numpy)) ; for cython module
                                         ; numpy_formathandler, thus not propagated
     (arguments
      `(#:tests? #f
-- 
2.46.0