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

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

Change-Id: Ie46c7bf03fb297cef592f1a8eee88b62c58924af
---
 gnu/packages/video.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2da458ed01..0c34ca3c3a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -508,7 +508,7 @@ (define-public schroedinger
      (list dash gtk-doc/stable pkg-config))
     (inputs
      `(("glew" ,glew)
-       ("opengl" ,mesa)))
+       ("opengl" ,libgl)))
     (propagated-inputs
      (list orc))
     (synopsis "Dirac video codec")
@@ -551,7 +551,7 @@ (define-public libquicktime
            libjpeg-turbo
            libpng
            libvorbis
-           mesa
+           libgl
            schroedinger
            libx11
            libx264
@@ -1461,7 +1461,7 @@ (define-public libcaca
            ftgl
            imlib2
            libx11
-           mesa
+           libgl
            ncurses
            zlib))
     (home-page "http://caca.zoy.org/wiki/libcaca")
@@ -1568,7 +1568,7 @@ (define-public libplacebo
                                   "/share/vulkan/registry/vk.xml"))))
     (native-inputs
      (list glad python python-mako pkg-config))
-    (inputs (list libepoxy mesa vulkan-headers))
+    (inputs (list libepoxy libgl vulkan-headers))
     ;; These are propagated as they are listed in 'Requires.private' of
     ;; libplacebo.pc.
     (propagated-inputs (list lcms shaderc vulkan-loader))
@@ -1599,7 +1599,7 @@ (define-public libva
            libx11
            libxext
            libxfixes
-           mesa
+           libgl
            wayland))
     (arguments
      (list
@@ -1655,7 +1655,7 @@ (define-public libva-utils
     (native-inputs
      (list pkg-config))
     (inputs
-     (list libdrm libva libx11 mesa wayland))
+     (list libdrm libva libx11 libgl wayland))
     (home-page "https://github.com/intel/libva-utils")
     (synopsis "Collection of testing utilities for VA-API")
     (description
@@ -1706,7 +1706,7 @@ (define-public ffmpeg-7
             libwebp
             libx11
             libx264
-            mesa
+            libgl
             openal
             pulseaudio
             sdl2
@@ -2486,7 +2486,7 @@ (define-public vlc
            libxpm
            livemedia-utils
            lua-5.2
-           mesa
+           libgl
            opus
            perl
            protobuf
@@ -2641,7 +2641,7 @@ (define-public mplayer
            libxinerama
            libxv
            libxxf86dga
-           mesa
+           libgl
            opus
            perl
            pulseaudio
@@ -2737,7 +2737,7 @@ (define-public mpv
            libxv
            ;; XXX: lua > 5.2 is not currently supported; see meson.build
            lua-5.2
-           mesa
+           libgl
            pulseaudio
            shaderc
            wayland
@@ -4074,7 +4074,7 @@ (define-public obs
                      (,(string-append #$(this-package-input "vlc")
                                       "/lib")
                       ;; TODO: Remove this once our mesa has glvnd support.
-                      ,(string-append #$(this-package-input "mesa")
+                      ,(string-append #$(this-package-input "libgl")
                                       "/lib"))))))))))
     (native-search-paths
      (list (search-path-specification
@@ -4101,14 +4101,14 @@ (define-public obs
       jack-1
       jansson
       libdatachannel
-      libglvnd
+      ;;libglvnd
       libva
       libx264
       libxcomposite
       libxkbcommon
       luajit
       mbedtls-lts
-      mesa
+      libgl
       nlohmann-json
       pciutils
       pipewire
@@ -4327,7 +4327,7 @@ (define-public obs-looking-glass
            freetype
            glu
            gmp
-           libglvnd
+           ;;libglvnd
            libiberty
            libx11
            libxcursor
@@ -4338,7 +4338,7 @@ (define-public obs-looking-glass
            libxpresent
            libxrandr
            libxscrnsaver
-           mesa
+           libgl
            obs
            openssl
            sdl2
@@ -4674,7 +4674,7 @@ (define-public obs-vkcapture
     (arguments
      '(#:tests? #f)) ;no tests
     (native-inputs (list pkg-config))
-    (inputs (list mesa
+    (inputs (list libgl
                   obs
                   libx11
                   libxcb
@@ -4769,7 +4769,7 @@ (define-public libvdpau-va-gl
     (native-inputs
      (list libvdpau pkg-config))
     (inputs
-     (list libva mesa))
+     (list libva libgl))
     (home-page "https://github.com/i-rinat/libvdpau-va-gl")
     (synopsis "VDPAU driver with VA-API/OpenGL backend")
     (description
@@ -5571,7 +5571,7 @@ (define-public aegisub
            ffms2
            fftw
            hunspell
-           mesa
+           libgl
            libass
            alsa-lib
            pulseaudio
-- 
2.46.0