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

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

Change-Id: Idf527284251637d8e689834f83eef8eb7a74cdd8
---
 gnu/packages/games.scm | 72 +++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 39e3b6dc0b..a8a54063af 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -857,7 +857,7 @@ (define-public vdrift
                                   "data")
                 (for-each make-file-writable (find-files "data/locale")))))))
       (native-inputs (list gettext-minimal pkg-config vdrift-data))
-      (inputs (list bullet curl libvorbis mesa sdl2 zlib))
+      (inputs (list bullet curl libvorbis libgl sdl2 zlib))
       (home-page "https://vdrift.net/")
       (synopsis "Racing simulator")
       (description "VDrift aims to provide an accurate driving physics
@@ -1763,7 +1763,7 @@ (define-public freedroidrpg
            libogg
            libpng
            libvorbis
-           mesa
+           libgl
            python-wrapper
            sdl
            sdl-gfx
@@ -1834,7 +1834,7 @@ (define-public golly
     (native-inputs
      (list lua))
     (inputs
-     (list glu mesa python sdl2 wxwidgets zlib))
+     (list glu libgl python sdl2 wxwidgets zlib))
     (home-page "https://golly.sourceforge.net/")
     (synopsis "Software for exploring cellular automata")
     (description
@@ -2054,7 +2054,7 @@ (define-public opensurge
                                  "Roboto-Bold.ttf"
                                  "Roboto-Medium.ttf"))))))))
     (inputs
-     (list allegro font-google-roboto mesa physfs surgescript xdg-utils))
+     (list allegro font-google-roboto libgl physfs surgescript xdg-utils))
     (home-page "https://opensurge2d.org")
     (synopsis "2D retro side-scrolling game")
     (description "@code{Open Surge} is a 2D retro side-scrolling platformer
@@ -2225,7 +2225,7 @@ (define-public gnubg
                   glib
                   readline
                   gtk+-2
-                  mesa
+                  libgl
                   glu
                   gtkglext
                   sqlite
@@ -2293,7 +2293,7 @@ (define-public gnubik
                          "true"))
                       #t)))))
     (inputs (list gtk+-2
-                  mesa
+                  libgl
                   glu
                   libx11
                   guile-2.0
@@ -2545,7 +2545,7 @@ (define-public pipewalker
                 (string-append assignment "$(docdir)\n")))
              #t)))))
     (inputs
-     (list libpng mesa sdl))
+     (list libpng libgl sdl))
     (home-page "https://pipewalker.sourceforge.net/")
     (synopsis "Logical tile puzzle")
     (description
@@ -3212,7 +3212,7 @@ (define-public trigger-rally
      `(("freealut" ,freealut)
        ("glew" ,glew)
        ("glu" ,glu)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("openal" ,openal)
        ("physfs" ,physfs)
        ("sdl" ,(sdl-union (list sdl2 sdl2-image)))
@@ -3449,7 +3449,7 @@ (define-public ufoai
        ("libvorbis" ,libvorbis)
        ("libxml2" ,libxml2)
        ("lua" ,lua-5.1)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("minixml" ,minixml)
        ("sdl-union" ,(sdl-union (list sdl2 sdl2-mixer sdl2-ttf)))
        ("zlib" ,zlib)))
@@ -3617,7 +3617,7 @@ (define-public pingus
     (inputs (list sdl
                   sdl-image
                   sdl-mixer
-                  mesa
+                  libgl
                   glu
                   libpng
                   boost))
@@ -3690,7 +3690,7 @@ (define-public taisei
            libpng
            libwebp
            libzip
-           mesa
+           libgl
            openssl
            opusfile
            sdl2
@@ -4101,7 +4101,7 @@ (define-public irrlicht
            libpng
            libx11
            libxxf86vm
-           mesa))
+           libgl))
     (synopsis "3D game engine written in C++")
     (description
      "The Irrlicht Engine is a high performance realtime 3D engine written in
@@ -4144,7 +4144,7 @@ (define-public mars
                                 (assoc-ref outputs "out")
                                 "/share/games/marsshooter/\";"))))))))
       (inputs
-       (list mesa fribidi taglib sfml))
+       (list libgl fribidi taglib sfml))
       (home-page "https://mars-game.sourceforge.net/")
       (synopsis "2D space shooter")
       (description
@@ -4298,7 +4298,7 @@ (define-public fifechan
                 "0wxs9vz5x9y8chghd8vp7vfk089lfb0qnzggi17zrqkrngs5zgi9"))))
     (build-system cmake-build-system)
     (inputs
-     (list sdl2 sdl2-image mesa))
+     (list sdl2 sdl2-image libgl))
     (arguments
      '(#:tests? #f))                    ; No included tests
     (home-page "https://fifengine.github.io/fifechan/")
@@ -4624,7 +4624,7 @@ (define-public supertuxkart
        ("libvorbis" ,libvorbis)
        ("libx11" ,libx11)
        ("libxrandr" ,libxrandr)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("openal" ,openal)
        ("sdl2" ,sdl2)
        ("sqlite" ,sqlite)
@@ -4763,7 +4763,7 @@ (define-public gnujump
                            Categories=Game;ArcadeGame~%"
                            out)))))))))
     (inputs
-     (list glu mesa sdl sdl-image sdl-mixer))
+     (list glu libgl sdl sdl-image sdl-mixer))
     (home-page "http://gnujump.es.gnu.org/")
     (synopsis
      "Game of jumping to the next floor, trying not to fall")
@@ -4908,7 +4908,7 @@ (define-public manaplus
     (native-inputs
      (list pkg-config))
     (inputs
-     (list glu curl libxml2 mesa
+     (list glu curl libxml2 libgl
            sdl2 sdl2-image sdl2-mixer sdl2-net sdl2-ttf))
     (home-page "https://manaplus.org")
     (synopsis "Client for 'The Mana World' and similar games")
@@ -5372,7 +5372,7 @@ (define-public openrct2
               ("nlohmann-json" ,nlohmann-json)
               ("libpng" ,libpng)
               ("libzip" ,libzip)
-              ("mesa" ,mesa)
+              ("libgl" ,libgl)
               ("openrct2-objects" ,openrct2-objects)
               ("openrct2-title-sequences" ,openrct2-title-sequences)
               ("openssl" ,openssl)
@@ -5447,7 +5447,7 @@ (define-public pinball
     (inputs
      (list glu
            libltdl
-           mesa
+           libgl
            (sdl-union (list sdl2 sdl2-image sdl2-mixer))))
     (arguments
      (list
@@ -6236,7 +6236,7 @@ (define-public tuxpaint-config
            ;; TODO: Should the following be propagated by fltk?
            libx11
            libxft
-           mesa))
+           libgl))
     (arguments
      `(#:make-flags `("VER_DATE=2018-09-01"
                       "CONFDIR=/etc/tuxpaint" ;don't write to store
@@ -6302,7 +6302,7 @@ (define-public supertux
                  glm
                  libogg
                  libvorbis
-                 mesa
+                 libgl
                  openal
                  physfs
                  sdl2
@@ -6827,7 +6827,7 @@ (define-public megaglest
            glew
            libjpeg-turbo
            megaglest-data
-           mesa
+           libgl
            miniupnpc
            openal
            libircclient
@@ -6894,7 +6894,7 @@ (define-public freegish
              openal
              libvorbis
              libogg
-             mesa
+             libgl
              libpng))
       (home-page "https://github.com/freegish/freegish")
       (synopsis "Side-scrolling physics platformer with a ball of tar")
@@ -6939,7 +6939,7 @@ (define-public cdogs-sdl
     (native-inputs
      (list pkg-config))
     (inputs
-     (list gtk+ mesa sdl2 sdl2-image sdl2-mixer))
+     (list gtk+ libgl sdl2 sdl2-image sdl2-mixer))
     (home-page "https://cxong.github.io/cdogs-sdl/")
     (synopsis "Classic overhead run-and-gun game")
     (description "C-Dogs SDL is a classic overhead run-and-gun game,
@@ -7105,7 +7105,7 @@ (define-public teeworlds
            font-dejavu
            glu
            json-parser
-           mesa
+           libgl
            pnglite
            sdl2
            sdl2-image
@@ -7519,7 +7519,7 @@ (define-public 0ad
      (list boost
            cmake-minimal
            cxxtest
-           mesa
+           libgl
            pkg-config
            python-2))
     (build-system gnu-build-system)
@@ -7896,7 +7896,7 @@ (define-public torcs
            libxrandr
            libxrender
            libxt
-           mesa
+           libgl
            openal
            plib
            zlib))
@@ -7952,7 +7952,7 @@ (define-public quakespasm
     (inputs (list libmikmod
                   libvorbis
                   flac
-                  mesa
+                  libgl
                   mpg123
                   sdl2))
     (synopsis "First person shooter engine for Quake 1")
@@ -8073,7 +8073,7 @@ (define-public yamagi-quake2
     (inputs
      (list curl
            libvorbis
-           mesa
+           libgl
            openal
            sdl2
            zlib))
@@ -8189,7 +8189,7 @@ (define-public pioneer
            libsigc++-2
            libvorbis
            lua-5.2                      ;not compatible with 5.3
-           mesa
+           libgl
            (sdl-union (list sdl2 sdl2-image))))
     (arguments
      `(#:tests? #f                      ;tests are broken
@@ -8425,7 +8425,7 @@ (define-public gzdoom
                   libgme
                   libjpeg-turbo
                   libsndfile
-                  mesa
+                  libgl
                   mpg123
                   openal
                   sdl2
@@ -8741,7 +8741,7 @@ (define-public xonotic
            libxext
            libxau
            libxdmcp
-           mesa
+           libgl
            glu
            freetype
            sdl2
@@ -9436,7 +9436,7 @@ (define-public stepmania
        ("libvorbis" ,libvorbis)
        ("libxinerama" ,libxinerama)
        ("libxrandr" ,libxrandr)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("pcre" ,pcre)
        ("pulseaudio" ,pulseaudio)
        ("sdl" ,sdl2)
@@ -9867,7 +9867,7 @@ (define-public openclonk
            libpng
            libvorbis
            libxrandr
-           mesa
+           libgl
            miniupnpc
            openal
            pcg-cpp
@@ -10107,7 +10107,7 @@ (define-public marble-marcher
                  (install-file "MarbleMarcher" bin))
                #t)))))
       (inputs
-       (list eigen mesa sfml))
+       (list eigen libgl sfml))
       (native-inputs
        (list pkg-config))
       (home-page "https://codeparade.itch.io/marblemarcher")
@@ -10157,7 +10157,7 @@ (define simgear
      `(("boost" ,boost)
        ("curl" ,curl)
        ("expat" ,expat)
-       ("mesa" ,mesa)
+       ("libgl" ,libgl)
        ("openal" ,openal)
        ("openscenegraph" ,openscenegraph)
        ("zlib" ,zlib)))
-- 
2.46.0