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

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

Change-Id: I1a939b7b1fa90d7aa0426100e8558487ac07dcf5
---
 gnu/packages/game-development.scm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 6be9d746c7..96a6a47daa 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -192,7 +192,7 @@ (define-public bullet
                 "# ADD_TEST(Test_BulletInverseForward"))
              #t)))))
     (inputs
-     (list glu libx11 mesa))
+     (list glu libx11 libgl))
     (home-page "https://pybullet.org/wordpress/")
     (synopsis "3D physics engine library")
     (description
@@ -841,7 +841,7 @@ (define-public sfml
     (native-inputs
      (list pkg-config))
     (inputs
-     `(("mesa" ,mesa)
+     `(("libgl" ,libgl)
        ("glew" ,glew)
        ("libx11" ,libx11)
        ("xcb-util-image" ,xcb-util-image)
@@ -1012,7 +1012,7 @@ (define-public love
            libtheora
            libvorbis
            luajit
-           mesa
+           libgl
            mpg123
            openal
            sdl2
@@ -1083,7 +1083,7 @@ (define-public allegro-4
                (("ADDON_LINKAGE STATIC")
                 "ADDON_LINKAGE SHARED")))))))
     (inputs
-     (list glu libpng libvorbis mesa zlib))
+     (list glu libpng libvorbis libgl zlib))
     (synopsis "Game programming library")
     (description "Allegro is a library mainly aimed at video game and
 multimedia programming.  It handles common, low-level tasks such as creating
@@ -1119,7 +1119,7 @@ (define-public allegro
        ("libxcursor" ,libxcursor)
        ("libxinerama" ,libxinerama)
        ("libxrandr" ,libxrandr)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("openal" ,openal)
        ("physfs" ,physfs)
        ("zlib" ,zlib)))
@@ -1865,8 +1865,8 @@ (define-public mygui-gl
      (modify-inputs (package-inputs mygui)
        (delete "ogre")
        (prepend glu
-                libglvnd                ; for find_package(… GLX)
-                mesa                    ; for find_package(… OpenGL …)
+                ;;libglvnd                ; for find_package(… GLX)
+                libgl                    ; for find_package(… OpenGL …)
                 (sdl-union (list sdl2 sdl2-image)))))
     (synopsis "Fast, flexible and simple GUI (OpenGL backend)")))
 
@@ -2070,7 +2070,7 @@ (define-public godot-lts
            libxinerama
            libxrandr
            mbedtls-lts
-           mesa
+           libgl
            opusfile
            pcre2
            pulseaudio
@@ -2325,7 +2325,7 @@ (define-public godot
            libxkbcommon
            libxrandr
            mbedtls-lts
-           mesa
+           libgl
            openxr
            opusfile
            pcre2
@@ -2417,7 +2417,7 @@ (define-public eureka
 
                (substitute* "Makefile"
                  (("-o root") ""))))))))
-    (inputs `(("mesa" ,mesa)
+    (inputs `(("libgl" ,libgl)
               ("libxft" ,libxft)
               ("libxinerama" ,libxinerama)
               ("libfontconfig" ,fontconfig)
@@ -2560,7 +2560,7 @@ (define-public plib
     ;; with PIC, so that shared programs can at least "link" to it.
     (arguments (list #:configure-flags #~(list "CXXFLAGS=-fPIC")))
     (native-inputs (list autoconf automake pkg-config))
-    (inputs (list mesa libxi libxmu))
+    (inputs (list libgl libxi libxmu))
     (home-page "https://plib.sourceforge.net/")
     (synopsis "Suite of portable game libraries")
     (description "PLIB is a set of libraries that will permit programmers to
@@ -2868,7 +2868,7 @@ (define-public ode
               (substitute* "CMakeLists.txt"
                 (("configure_file\\(libccd/.*") "")))))))
     (inputs
-     (list glu libccd mesa))
+     (list glu libccd libgl))
     (home-page "https://www.ode.org/")
     (synopsis "High performance library for simulating rigid body dynamics")
     (description "ODE is a high performance library for simulating
@@ -3089,7 +3089,7 @@ (define-public warsow-qfusion
          ("libpng" ,libpng)
          ("libtheora" ,libtheora)
          ("libvorbis" ,libvorbis)
-         ("mesa" ,mesa)
+         ("libgl" ,libgl)
          ("openal" ,openal)
          ("pulseaudio" ,pulseaudio)
          ("qtbase" ,qtbase-5)
@@ -3228,7 +3228,7 @@ (define-public tesseract-engine
        `(("sdl2-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-image)))
          ("zlib" ,zlib)
          ("libpng" ,libpng)
-         ("libgl" ,mesa)))
+         ("libgl" ,libgl)))
       (home-page "http://tesseract.gg/")
       (synopsis "First-person shooter engine with map editing, instagib, DM and CTF")
       (description "This package contains the game engine of Tesseract, a
-- 
2.46.0