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

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

Change-Id: I0c339da11294e8b328d61e3d24afb420d8c9aa20
---
 gnu/packages/graphics.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 8686cac7f7..d8aa363e82 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -244,7 +244,7 @@ (define-public directfb
            libmng
            libmpeg2
            libmpeg3
-           mesa
+           libgl
            libpng
            sdl
            (librsvg-for-system)
@@ -307,7 +307,7 @@ (define-public minifb
          ;; No check target.
          #:tests? #f))
       ;; libminifb.a won't work without these libraries, so propagate them.
-      (propagated-inputs (list libx11 libxkbcommon mesa))
+      (propagated-inputs (list libx11 libxkbcommon libgl))
       (synopsis "Small library for rendering pixels to a framebuffer")
       (description "MiniFB (Mini FrameBuffer) is a small, cross-platform
 library that makes it easy to render (32-bit) pixels in a window.")
@@ -366,7 +366,7 @@ (define-public fox
     (inputs
      `(("bzip2" ,lbzip2)
        ("freetype" ,freetype)
-       ("gl" ,mesa)
+       ("gl" ,libgl)
        ("glu" ,glu)
        ("jpeg" ,libjpeg-turbo)
        ("png" ,libpng)
@@ -1151,7 +1151,7 @@ (define-public mangohud
            hwdata
            imgui-1.86
            libx11
-           mesa
+           libgl
            mesa-utils
            nlohmann-json
            python-mako
@@ -1224,7 +1224,7 @@ (define-public ogre
                   libxaw
                   libxrandr
                   libxt
-                  mesa
+                  libgl
                   pugixml
                   sdl2
                   zlib))
@@ -1405,7 +1405,7 @@ (define-public openimageio
            freetype
            giflib
            imath
-           libglvnd
+           libgl
            libheif
            libjpeg-turbo
            libpng
@@ -1500,7 +1500,7 @@ (define-public openscenegraph
        ("librsvg" ,(librsvg-for-system))
        ("libxrandr" ,libxrandr)
        ("ffmpeg" ,ffmpeg-4)
-       ("mesa" ,mesa)))
+       ("libgl" ,libgl)))
     (synopsis "High-performance real-time graphics toolkit")
     (description
      "The OpenSceneGraph is a high-performance 3D graphics toolkit
@@ -1740,7 +1740,7 @@ (define-public brdf-explorer
       (native-inputs
        (list qttools-5)) ;for 'qmake'
       (inputs
-       (list qtbase-5 mesa glew freeglut zlib))
+       (list qtbase-5 libgl glew freeglut zlib))
       (home-page
        (string-append "https://web.archive.org/web/20190115030100/"
                       "https://www.disneyanimation.com/technology/brdf.html"))
@@ -2345,7 +2345,7 @@ (define-public skia
   (native-inputs (list gn libjpeg-turbo ninja pkg-config python-wrapper
                        spirv-tools spirv-headers
                        icu4c-for-skia glu xorg-server-for-tests))
-  (inputs (list expat fontconfig freetype harfbuzz mesa libwebp zlib))
+  (inputs (list expat fontconfig freetype harfbuzz libgl libwebp zlib))
   (home-page "https://skia.org/")
   (synopsis "2D graphics library")
   (description
@@ -2473,7 +2473,7 @@ (define-public openxr
     (native-inputs
      (list pkg-config python shaderc vulkan-headers))
     (inputs
-     (list jsoncpp mesa vulkan-loader wayland))
+     (list jsoncpp libgl vulkan-loader wayland))
     (home-page "https://www.khronos.org/openxr/")
     (synopsis "Generated headers and sources for OpenXR loader")
     (description "This package contains OpenXR headers, as well as source code
@@ -2568,7 +2568,7 @@ (define-public monado
            libusb
            libxcb
            libxrandr
-           mesa
+           libgl
            python
            v4l-utils
            vulkan-loader))
-- 
2.46.0