* [bug#74522] [PATCH 01/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 02/73] " The Man
` (71 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man, Sharlatan Hellseher
Change-Id: I49cef6bf2d6dbd1ec912357a73ae56ded4c2acab
---
gnu/packages/admin.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 46282da67e..ee8b5152c5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4322,7 +4322,7 @@ (define-public fastfetch
glib
imagemagick
libxcb
- mesa
+ libgl
wayland
zlib)) ;for imagemagick and an #ifdef
(native-inputs (list pkg-config))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 02/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 01/73] move libgl provider from mesa to libglvnd+mesa The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 03/73] " The Man
` (70 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man, Andreas Enge, Eric Bavier, Sharlatan Hellseher
Change-Id: I2d8492464f89fb873d5fdef5da48ae21e1c501b4
---
gnu/packages/algebra.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 2187cd062d..b5673e1992 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -423,7 +423,7 @@ (define-public giac
libxft
libxinerama
libxt
- mesa
+ libgl
mpfi
mpfr
ntl
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 03/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 01/73] move libgl provider from mesa to libglvnd+mesa The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 02/73] " The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 04/73] " The Man
` (69 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I6f50b9235e1fa0d6272bfd5925958d5f08baeaf6
---
gnu/packages/arcan.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 114ca772fb..0133b4c79c 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -174,7 +174,7 @@ (define-public arcan-sdl
(inputs
(modify-inputs (package-inputs arcan)
(delete "libdrm")
- (prepend glu libglvnd mesa sdl2)))
+ (prepend glu libgl sdl2)))
(arguments
`(,@(ensure-keyword-arguments
(package-arguments arcan)
@@ -300,7 +300,7 @@ (define-public xarcan
libxfont2
libxkbfile
libxshmfence
- mesa
+ libgl
openssl
pixman
xcb-util
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 04/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (2 preceding siblings ...)
2024-11-25 3:40 ` [bug#74522] [PATCH 03/73] " The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 05/73] " The Man
` (68 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man, Andreas Enge, Eric Bavier, Sharlatan Hellseher
Change-Id: Iade1a73b2b356f51efbc6f5bb618bcc6377c0787
---
gnu/packages/astronomy.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index f3fcfdbd46..d869108697 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -509,7 +509,7 @@ (define-public celestia
libjpeg-turbo
libpng
libtheora
- mesa))
+ libgl))
(propagated-inputs
(list lua))
(home-page "https://celestia.space/")
@@ -6844,7 +6844,7 @@ (define-public stellarium
(list doxygen
gettext-minimal
graphviz
- mesa
+ libgl
perl
python-wrapper
qttools-5))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 05/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (3 preceding siblings ...)
2024-11-25 3:40 ` [bug#74522] [PATCH 04/73] " The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:40 ` [bug#74522] [PATCH 06/73] " The Man
` (67 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man, Gabriel Wicki
Change-Id: I9dea49ebacb945f951be7d94c23556e51e7e021e
---
gnu/packages/audio.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f842d77031..37699a55a6 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1745,7 +1745,7 @@ (define-public tao
(list audiofile
libxi
libxmu
- mesa
+ libgl
freeglut
flex
bison
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 06/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (4 preceding siblings ...)
2024-11-25 3:40 ` [bug#74522] [PATCH 05/73] " The Man
@ 2024-11-25 3:40 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 07/73] " The Man
` (66 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:40 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ib881b39f41ee964fcec5d1a96115b1d273888919
---
gnu/packages/chromium.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index cf1703cecb..b41f5aa091 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -796,7 +796,7 @@ (define-public ungoogled-chromium
"chromium/master-preferences.json")))
(gtk (dirname (dirname
(search-input-file inputs "lib/libgtk-3.so"))))
- (mesa (dirname (search-input-file inputs "lib/libGL.so")))
+ (libgl (dirname (search-input-file inputs "lib/libGL.so")))
(vulkan (dirname (search-input-file inputs "lib/libvulkan.so")))
(xdg-utils (dirname (search-input-file inputs "bin/xdg-open"))))
@@ -838,7 +838,7 @@ (define-public ungoogled-chromium
;; Provide libGL and libvulkan without patching all references.
;; XXX: How to add on RUNPATH instead of this hack?
`("LD_LIBRARY_PATH" ":" prefix
- (,(string-append mesa ":" vulkan)))
+ (,(string-append libgl ":" vulkan)))
;; Ensure xdg-open et al. is found.
`("PATH" ":" prefix (,xdg-utils))))
@@ -908,7 +908,7 @@ (define-public ungoogled-chromium
libxscrnsaver
libxslt
libxtst
- mesa
+ libgl
minizip
mit-krb5
nss
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 07/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (5 preceding siblings ...)
2024-11-25 3:40 ` [bug#74522] [PATCH 06/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 08/73] " The Man
` (65 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I185913ddd350bffcc70ff7a78956f762b71fce04
---
gnu/packages/compton.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm
index 00bea9669b..4564c73710 100644
--- a/gnu/packages/compton.scm
+++ b/gnu/packages/compton.scm
@@ -71,7 +71,7 @@ (define-public compton
libxinerama
libxrandr
libxrender
- mesa
+ libgl
xprop
xwininfo))
(native-inputs
@@ -133,7 +133,7 @@ (define-public picom
libx11
libxext
libxdg-basedir
- mesa
+ libgl
pcre2
pixman
uthash
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 08/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (6 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 07/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 09/73] " The Man
` (64 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ic03343be5d506377432dfea473f8eb105da64dac
---
gnu/packages/cpp.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index eacc6e46ab..ec5008937a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3033,7 +3033,7 @@ (define-public wdl
gtk+
libxi
libx11
- mesa
+ libgl
zlib))
(home-page "https://www.cockos.com/wdl/")
(synopsis "Modestly reusable C++ libraries")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 09/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (7 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 08/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 10/73] " The Man
` (63 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Efraim Flashner
Change-Id: I8b2c8de1419bc80c2549a47d0cafe520de58163a
---
gnu/packages/crates-graphics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index 0c1b944736..a539fefb2c 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -5516,7 +5516,7 @@ (define-public rust-x11-2
(("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3))))
(propagated-inputs
- (list mesa))
+ (list libgl))
(home-page "https://github.com/erlepereira/x11-rs")
(synopsis "X11 library bindings for Rust")
(description "This crate provides X11 library bindings for Rust.")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 10/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (8 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 09/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 11/73] " The Man
` (62 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Efraim Flashner
Change-Id: I7653011aae8c5971b02b480709f88dddf64f4d15
---
gnu/packages/crates-io.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 16f7a0a389..1676546a91 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -90833,7 +90833,7 @@ (define-public rust-xcb-1
("rust-quick-xml" ,rust-quick-xml-0.22)
("rust-x11" ,rust-x11-2))))
(inputs
- (list mesa)) ;required by rust-x11-2
+ (list libgl)) ;required by rust-x11-2
(native-inputs
(list pkg-config))
(home-page "https://github.com/rust-x-bindings/rust-xcb")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 11/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (9 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 10/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 5:18 ` Liliana Marie Prikler
2024-11-25 3:41 ` [bug#74522] [PATCH 12/73] " The Man
` (61 subsequent siblings)
72 siblings, 1 reply; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Adam Faiz, Liliana Marie Prikler,
宋文武
Change-Id: I78d884f62af4a0cf7fe6dd0fc980a4063b784f9a
---
gnu/packages/emulators.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 948e588c4c..5b93a745a9 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -220,7 +220,7 @@ (define-public blastem
("shaders" "share/blastem/shaders"))
args))))))
(inputs
- (list glew mesa sdl2 zlib))
+ (list glew libgl sdl2 zlib))
(native-inputs
(list pkg-config))
(home-page "https://www.retrodev.com/blastem/")
@@ -361,7 +361,7 @@ (define-public dolphin-emu
libxrandr
lzo
mbedtls-lts
- mesa
+ libgl
miniupnpc
openal
pugixml
@@ -405,7 +405,7 @@ (define-public dosbox
zlib
alsa-lib
glu
- mesa))
+ libgl))
(home-page "https://www.dosbox.com")
(synopsis "X86 emulator with CGA/EGA/VGA/etc. graphics and sound")
(description "DOSBox is a DOS-emulator that uses the SDL library. DOSBox
@@ -453,7 +453,7 @@ (define-public dosbox-staging
iir
libpng
libslirp
- mesa
+ libgl
opusfile
sdl2
sdl2-image
@@ -571,7 +571,7 @@ (define-public emulation-station
("eigin" ,eigen)
("freeimage" ,freeimage)
("freetype" ,freetype)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("sdl2" ,sdl2)))
(synopsis "Video game console emulator front-end")
(description "EmulationStation provides a graphical front-end to a large
@@ -606,7 +606,7 @@ (define-public higan
("gtksourceview-2" ,gtksourceview-2)
("libxrandr" ,libxrandr)
("libxv" ,libxv)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("openal" ,openal)
("pulseaudio" ,pulseaudio)
("sdl2" ,sdl2)))
@@ -780,7 +780,7 @@ (define-public mgba
libelf
libepoxy
libpng
- mesa
+ libgl
minizip
ncurses
qtbase-5
@@ -864,7 +864,7 @@ (define-public mupen64plus-core
(list freetype
glu
libpng
- mesa
+ libgl
sdl2
zlib))
(arguments
@@ -1082,7 +1082,7 @@ (define-public mupen64plus-video-arachnoid
(native-inputs
(list pkg-config which))
(inputs
- (list mesa mupen64plus-core))
+ (list libgl mupen64plus-core))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -1126,7 +1126,7 @@ (define-public mupen64plus-video-glide64
(native-inputs
(list pkg-config which))
(inputs
- (list mesa mupen64plus-core sdl2))
+ (list libgl mupen64plus-core sdl2))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -1171,7 +1171,7 @@ (define-public mupen64plus-video-glide64mk2
(inputs
(list boost
libpng
- mesa
+ libgl
mupen64plus-core
sdl2
zlib))
@@ -1218,7 +1218,7 @@ (define-public mupen64plus-video-rice
(native-inputs
(list pkg-config which))
(inputs
- (list libpng mesa mupen64plus-core sdl2))
+ (list libpng libgl mupen64plus-core sdl2))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -1418,7 +1418,7 @@ (define-public mupen64plus-video-gliden64
(add-after 'chdir 'generate-Revision.h
(lambda _
(invoke "sh" "getRevision.sh" "--nogit"))))))
- (inputs (list freetype libpng mesa xxhash zlib))
+ (inputs (list freetype libpng libgl xxhash zlib))
(home-page "https://github.com/gonetz/GLideN64")
(synopsis "Mupen64Plus GlideN64 video plugin")
(description "GLideN64 is a new generation graphics plugin for Nintendo
@@ -1538,7 +1538,7 @@ (define-public libretro-mupen64plus-nx
(install-file "mupen64plus_next_libretro.so"
(string-append #$output "/lib/libretro/")))))))
(native-inputs (list nasm pkg-config))
- (inputs (list mesa libpng minizip unzip xxhash zlib))
+ (inputs (list libgl libpng minizip unzip xxhash zlib))
(home-page "https://github.com/libretro/mupen64plus-libretro-nx")
(synopsis "Improved Mupen64Plus libretro core")
(description "Mupen64Plus-Next is a N64 emulation library for the
@@ -2455,7 +2455,7 @@ (define-public retroarch-minimal
libxrandr
libxv
mbedtls-lts
- mesa
+ libgl
openal
openssl
pulseaudio
@@ -3487,7 +3487,7 @@ (define-public zsnes
#:phases #~(modify-phases %standard-phases
(delete 'configure)))) ;no configure script
(native-inputs (list nasm pkg-config))
- (inputs (list glib libpng mesa ncurses sdl zlib))
+ (inputs (list glib libpng libgl ncurses sdl zlib))
(home-page "https://www.zsnes.com")
(synopsis "Super Nintendo Entertainment System emulator")
(description "ZSNES is a @acronym{Super Nintendo Entertainment System,
@@ -3627,7 +3627,7 @@ (define-public ppsspp
glslang
libpng
libzip
- mesa
+ libgl
miniupnpc
sdl2
snappy
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 11/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:41 ` [bug#74522] [PATCH 11/73] " The Man
@ 2024-11-25 5:18 ` Liliana Marie Prikler
0 siblings, 0 replies; 75+ messages in thread
From: Liliana Marie Prikler @ 2024-11-25 5:18 UTC (permalink / raw)
To: The Man, 74522; +Cc: 宋文武, Adam Faiz
Am Sonntag, dem 24.11.2024 um 21:41 -0600 schrieb The Man:
> Change-Id: I78d884f62af4a0cf7fe6dd0fc980a4063b784f9a
> ---
> gnu/packages/emulators.scm | 34 +++++++++++++++++-----------------
The ChangeLog is missing. Ditto for all the other patches I got. I'd
hazard a guess that much of this could be squashed together.
Cheers
^ permalink raw reply [flat|nested] 75+ messages in thread
* [bug#74522] [PATCH 12/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (10 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 11/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 13/73] " The Man
` (60 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I462ea7fdb88317c745e317924fc79c409a1707be
---
gnu/packages/engineering.scm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 3ceeb4425a..a97fba58f2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -481,7 +481,7 @@ (define-public pcb
(setenv "DISPLAY" ":1"))))))
(inputs
(list dbus
- mesa
+ libgl
glu
gd
gtk+-2
@@ -1061,7 +1061,7 @@ (define-public inspekt3d
(native-inputs
(list autoconf automake pkg-config))
(inputs
- (list mesa guile-3.0))
+ (list libgl guile-3.0))
(propagated-inputs
`(("libfive" ,libfive)
("guile-opengl" ,guile3.0-opengl)))
@@ -1155,7 +1155,7 @@ (define-public kicad
hicolor-icon-theme
libngspice
libsm
- mesa
+ libgl
opencascade-occt
openssl
python-wrapper
@@ -3234,7 +3234,7 @@ (define-public openctm
(native-inputs
(list pkg-config))
(inputs
- `(("mesa" ,mesa)
+ `(("libgl" ,libgl)
("glu" ,glu)
("glut" ,freeglut)
("gtk" ,gtk+-2)))
@@ -3309,7 +3309,7 @@ (define-public meshlab
(build-system cmake-build-system)
(inputs
(list qtbase-5
- mesa
+ libgl
glu
glew
muparser
@@ -3534,7 +3534,7 @@ (define-public solvespace
libpng
libspnav ;spaceware
mimalloc
- mesa
+ libgl
zlib))
(synopsis
"Parametric 2D/3D @acronym{CAD, computer-aided design} software")
@@ -3858,7 +3858,7 @@ (define-public libigl
("embree" ,embree-3)
("glfw" ,glfw-3.4)
("gmp" ,gmp)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("mpfr" ,mpfr)
("tbb" ,tbb)
("tinyxml2" ,tinyxml2)
@@ -4090,7 +4090,7 @@ (define-public prusa-slicer
libigl
libjpeg-turbo
libpng
- mesa
+ libgl
mpfr
nanosvg
nlopt
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 13/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (11 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 12/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 14/73] " The Man
` (59 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Iaf0b05b5aac44980b8d591f8c810ffac6a718d95
---
gnu/packages/enlightenment.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index cf9fe93b27..ed5e80039b 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -92,7 +92,7 @@ (define-public efl
gstreamer
gst-plugins-base
ibus-minimal
- mesa
+ libgl
libraw
(librsvg-for-system)
libspectre
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 14/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (12 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 13/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 15/73] " The Man
` (58 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Icc2df22b626ccec5e1bc98c3d587682487834b56
---
gnu/packages/erlang.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 6e88c38838..03b22b7ee7 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -78,7 +78,7 @@ (define-public erlang
(inputs
(list ncurses openssl wxwidgets))
(propagated-inputs
- (list fontconfig glu mesa))
+ (list fontconfig glu libgl))
(arguments
`(#:test-target "release_tests"
#:configure-flags
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 15/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (13 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 14/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 16/73] " The Man
` (57 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I596b99938527d79919ee6142fe64ea5edb30aa59
---
gnu/packages/fltk.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index 05d418022f..b32eba8862 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -60,7 +60,7 @@ (define-public fltk
("libpng" ,libpng)
("libx11" ,libx11)
("libxft" ,libxft)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("zlib" ,zlib)))
(arguments
`(#:tests? #f ;TODO: compile programs in "test" dir
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 16/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (14 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 15/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 17/73] " The Man
` (56 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I17852d35bfa612ff94b2ccc90aa689000ccab96f
---
gnu/packages/freedesktop.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index af35625c18..cdac378feb 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1476,7 +1476,7 @@ (define-public waylandpp
(native-inputs
(list pkg-config))
(inputs
- (list mesa pugixml))
+ (list libgl pugixml))
(propagated-inputs
(list ;; In Requires of the .pc files.
wayland))
@@ -1522,7 +1522,7 @@ (define-public weston
libxcb
libxcursor
libxml2
- mesa
+ libgl
mtdev
linux-pam
pango
@@ -3304,7 +3304,7 @@ (define-public xdg-desktop-portal-wlr
bash-minimal
grim
iniparser
- mesa
+ libgl
libinih
pipewire
slurp
@@ -3364,7 +3364,7 @@ (define-public waypipe
(list pkg-config scdoc
;; For tests
python))
- (inputs (list lz4 libva mesa libdrm ffmpeg))
+ (inputs (list lz4 libva libgl libdrm ffmpeg))
(arguments
(list #:configure-flags
#~(list "-Dwith_lz4=enabled" "-Dwith_vaapi=enabled"
@@ -3395,7 +3395,7 @@ (define-public libdecor
dbus
egl-wayland
gtk+
- libglvnd
+ libgl
libxkbcommon
pango
wayland
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 17/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (15 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 16/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 18/73] " The Man
` (55 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Adam Faiz, Liliana Marie Prikler,
宋文武
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
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 18/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (16 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 17/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 19/73] " The Man
` (54 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Adam Faiz, Liliana Marie Prikler,
宋文武
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
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 19/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (17 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 18/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 20/73] " The Man
` (53 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Andreas Enge, Eric Bavier, Sharlatan Hellseher
Change-Id: Ib4abea7f91edf10de0ab2b2e73fed5f41c5a372e
---
gnu/packages/geo.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index a9a9e1c945..1d426d04d3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2685,7 +2685,7 @@ (define-public opencpn
libsndfile
libusb
lz4
- mesa
+ libgl
pango
portaudio
sqlite
@@ -2796,7 +2796,7 @@ (define-public grass
glu
libpng
libtiff
- mesa
+ libgl
`(,mariadb "dev")
`(,mariadb "lib")
netcdf
@@ -3453,7 +3453,7 @@ (define-public gplates
glew
glu
gmp
- mesa
+ libgl
mpfr
proj
python-3
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 20/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (18 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 19/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 21/73] " The Man
` (52 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Liliana Marie Prikler, Maxim Cournoyer, Vivien Kraus
Change-Id: I5ebadc6475cda11c2cddd5d9b005e4ff3b0e8996
---
gnu/packages/gnome.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b8accb737d..266c0e6d9a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3235,7 +3235,7 @@ (define-public gtkglext
(substitute* "gdk/gdkglshapes.c"
((" index") " triangle_index"))
#t)))))
- (inputs (list gtk+-2 mesa glu libx11 libxt))
+ (inputs (list gtk+-2 libgl glu libx11 libxt))
(native-inputs (list pkg-config
`(,glib "bin")))
(propagated-inputs (list pangox-compat))
@@ -6302,7 +6302,7 @@ (define-public cogl
libxcomposite
libxrandr))
(inputs
- (list mesa
+ (list libgl
cairo
pango
gstreamer
@@ -6317,7 +6317,7 @@ (define-public cogl
;; Arrange to pass an absolute file name to
;; dlopen for libGL.so.
(string-append "--with-gl-libname="
- (assoc-ref %build-inputs "mesa")
+ (assoc-ref %build-inputs "libgl")
"/lib/libGL.so"))
#:phases
(modify-phases %standard-phases
@@ -7811,7 +7811,7 @@ (define-public gnome-session
libsm
libxcomposite
libxtst
- mesa
+ libgl
upower
xtrans))
(synopsis "Session manager for GNOME")
@@ -8156,7 +8156,7 @@ (define-public mutter
libxkbcommon
libxml2
libxrandr
- mesa
+ libgl
pango
xinput))
(inputs
@@ -9372,7 +9372,7 @@ (define-public gnome-control-center
libsecret
libxml2
libwacom
- mesa
+ libgl
mit-krb5
modem-manager
network-manager-applet
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 21/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (19 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 20/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 22/73] " The Man
` (51 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, André Batista, Clément Lassieur,
Jonathan Brielmaier, Mark H Weaver
Change-Id: Ib40a9f1be1b4f8785f97221f5ee3137a3fe88a32
---
gnu/packages/gnuzilla.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 8a6c558c50..b307295b1c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -747,7 +747,7 @@ (define-public icecat-minimal
icu4c-73
pixman
pulseaudio
- mesa
+ libgl
pciutils
mit-krb5
hunspell
@@ -954,7 +954,7 @@ (define-public icecat-minimal
"/share/fonts")
"/run/current-system/profile/share/fonts"
,@(append-map runpaths-of-input
- '("mesa" "ffmpeg"))))))
+ '("libgl" "ffmpeg"))))))
(whitelist-string (string-join whitelist ","))
(port (open-file "browser/app/profile/icecat.js" "a")))
(format #t "setting 'security.sandbox.content.read_path_whitelist' to '~a'~%"
@@ -1090,7 +1090,7 @@ (define-public icecat-minimal
(file-append (this-package-input label) "/lib"))
'("libpng-apng"
"libxscrnsaver"
- "mesa"
+ "libgl"
"pciutils"
"mit-krb5"
"eudev"
@@ -1564,7 +1564,7 @@ (define-public icedove-minimal
libxinerama
libxscrnsaver
libxt
- mesa
+ libgl
mit-krb5
nspr
;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later)
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 22/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (20 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 21/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 23/73] " The Man
` (50 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
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
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 23/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (21 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 22/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 24/73] " The Man
` (49 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Iecdab7618d3a05b732d105b56adc63a74c15955d
---
gnu/packages/graphviz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index a1626d3c58..da918f4760 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -334,7 +334,7 @@ (define-public xdot
(inputs (list at-spi2-core
bash-minimal
(librsvg-for-system)
- mesa
+ libgl
mesa-opencl
harfbuzz
graphviz
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 24/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (22 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 23/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 25/73] " The Man
` (48 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Liliana Marie Prikler, Maxim Cournoyer, Vivien Kraus
Change-Id: I5d68cbde63162043ecd1e6ca90b327cb898fe69b
---
gnu/packages/gstreamer.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 13c8734e68..80fa401db3 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -158,7 +158,7 @@ (define-public libdc1394
libraw1394
libusb
libxv
- mesa
+ libgl
sdl
v4l-utils))
(synopsis "1394-Based Digital Camera Control Library")
@@ -572,7 +572,7 @@ (define-public gst-plugins-base
libx11
libxext
libxv
- mesa
+ libgl
opus
pango
wayland-protocols
@@ -725,7 +725,7 @@ (define-public gst-plugins-good
libxfixes
libxext
libxshmfence
- mesa
+ libgl
mpg123
orc
pulseaudio
@@ -912,7 +912,7 @@ (define-public gst-plugins-bad
lilv
lrdf
lv2
- mesa
+ libgl
mjpegtools
neon
nettle
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 25/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (23 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 24/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 26/73] " The Man
` (47 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Liliana Marie Prikler, Maxim Cournoyer, Vivien Kraus
Change-Id: I840b07b845a3b3d89f6d41bd8e91651f5fdcdb32
---
gnu/packages/gtk.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ef1391e8ba..5951be46b2 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -270,7 +270,7 @@ (define-public cairo-xcb
(properties (alist-delete 'hidden? (package-properties cairo)))
(name "cairo-xcb")
(inputs
- `(("mesa" ,mesa)
+ `(("libgl" ,libgl)
,@(package-inputs cairo)))
(arguments
(substitute-keyword-arguments (package-arguments cairo)
@@ -1060,7 +1060,7 @@ (define-public gtk+
libxkbcommon
libxrandr
libxrender
- mesa
+ libgl
pango
wayland
wayland-protocols))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 26/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (24 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 25/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 27/73] " The Man
` (46 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I536d3c3a5f6c483b38a1e01ec5610ebb98bb9784
---
gnu/packages/guile-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a21289d368..80db8f9482 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2512,7 +2512,7 @@ (define-public guile-sly
(propagated-inputs
(list guile-sdl guile-opengl))
(inputs
- (list guile-2.2 gsl freeimage mesa))
+ (list guile-2.2 gsl freeimage libgl))
(synopsis "2D/3D game engine for GNU Guile")
(description "Sly is a 2D/3D game engine written in Guile Scheme. Sly
features a functional reactive programming interface and live coding
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 27/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (25 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 26/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 28/73] " The Man
` (45 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I62ebfea9dfa7b798d14074fbc988b0ee47c43628
---
gnu/packages/image-processing.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 3a7c67362f..35d1c254c1 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -300,7 +300,7 @@ (define-public opencolorio
glew
imath
lcms
- libglvnd
+ libgl
minizip-ng
openexr
pystring
@@ -425,7 +425,7 @@ (define-public vtk
libxml2
libxt
lz4
- mesa
+ libgl
netcdf
libpng
libtiff
@@ -1198,7 +1198,7 @@ (define-public paraview
libxt
lz4
lzip
- mesa
+ libgl
netcdf
openmpi
;;openvdb ;For OpenVDB; dependency not found
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 28/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (26 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 27/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 29/73] " The Man
` (44 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Julien Lepiller
Change-Id: Ief8c74a4c15d7f45f117e2f30fc252cc58bee1bf
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index df57385ea7..b5a428c1c7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3228,7 +3228,7 @@ (define-public java-swt
`(("gtk" ,gtk+-2)
("libxtst" ,libxtst)
("libxt" ,libxt)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("glu" ,glu)))
(native-inputs
(list pkg-config unzip))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 29/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (27 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 28/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 30/73] " The Man
` (43 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Efraim Flashner, Simon Tournier
Change-Id: Ib164572be98856f724824f0e59ee89d27217718d
---
gnu/packages/julia-jll.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm
index 50bbd40a84..8368c5dc9a 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -1017,11 +1017,11 @@ (define-public julia-libglvnd-jll
(lambda (wrapper)
(substitute* wrapper
(("artifact\"Libglvnd\"")
- (string-append "\"" (assoc-ref inputs "libglvnd") "\""))))
+ (string-append "\"" (assoc-ref inputs "libgl") "\""))))
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")))))))
(inputs
- (list libglvnd))
+ (list libgl))
(propagated-inputs
(list julia-jllwrappers julia-xorg-libx11-jll julia-xorg-libxext-jll))
(home-page "https://github.com/JuliaBinaryWrappers/Libglvnd_jll.jl")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 30/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (28 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 29/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 31/73] " The Man
` (42 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ic340792bb51c0ffb01da5f3b156b2cc2febb09ca
---
gnu/packages/kde-frameworks.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4f241cc2e3..8207f8039e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -5143,7 +5143,7 @@ (define-public plasma-framework
kwindowsystem-5
kxmlgui-5
;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
- libglvnd
+ libgl
phonon
qtbase-5
qtdeclarative-5
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 31/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (29 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 30/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 32/73] " The Man
` (41 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I0f1404a1db43d82139546a4f82c6d28b74e80cf8
---
gnu/packages/lego.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index b84ab3233e..847a8f6863 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -115,7 +115,7 @@ (define-public leocad
(native-inputs
(list qttools-5)) ; for lrelease
(inputs
- (list mesa qtbase-5 zlib))
+ (list libgl qtbase-5 zlib))
(arguments
'(#:tests? #f
#:phases
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 32/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (30 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 31/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 33/73] " The Man
` (40 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, André Batista, Clément Lassieur,
Jonathan Brielmaier, Mark H Weaver
Change-Id: Ie06eb727ebaecc7be9ca25a72a0d20cc36702958
---
gnu/packages/librewolf.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 6517c1953d..5a0b8efb9e 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -503,7 +503,7 @@ (define-public librewolf
(string-append (assoc-ref inputs
lib-name)
"/lib"))
- '("mesa" "pciutils"))))
+ '("libgl" "pciutils"))))
(wrap-program (car (find-files lib "^glxtest$"))
`("LD_LIBRARY_PATH" prefix ,libs)))))
(add-after 'install 'patch-config
@@ -565,7 +565,7 @@ (define-public librewolf
(string-append (assoc-ref inputs
lib-name)
"/lib"))
- '("mesa" "libpng-apng" "libnotify" "libva"
+ '("libgl" "libpng-apng" "libnotify" "libva"
"pulseaudio" "gtk+" "pipewire"
;; For U2F and WebAuthn
"eudev")))
@@ -582,7 +582,7 @@ (define-public librewolf
(rdd-whitelist (map (cut string-append <> "/")
(delete-duplicates (append-map
runpaths-of-input
- '("mesa"
+ '("libgl"
"ffmpeg")))))
(gtk-share (string-append (assoc-ref inputs
"gtk+")
@@ -674,7 +674,7 @@ (define-public librewolf
libxinerama
libxscrnsaver
libxt
- mesa
+ libgl
mit-krb5
nspr
nss-rapid
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 33/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (31 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 32/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 34/73] " The Man
` (39 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Maxim Cournoyer
Change-Id: I8a21fd852e211a6c805274d681b2ff39803900c3
---
gnu/packages/linphone.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index be011fd976..3aa775af26 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -661,7 +661,7 @@ (define-public mediastreamer2
glu
mesa-utils
gsm
- mesa
+ libgl
opus
ortp
libpcap
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 34/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (32 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 33/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 35/73] " The Man
` (38 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, Guillaume Le Vaillant, Katherine Cox-Buday,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
Change-Id: I45a865d2eb3c063e72d8ef8bd96dab0fcfcd2924
---
gnu/packages/lisp-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index f9f0e0bdc1..d0bc2f5059 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -8341,7 +8341,7 @@ (define-public sbcl-cl-opengl
("float-features" ,sbcl-float-features)
("freeglut" ,freeglut)
("glu" ,glu)
- ("mesa" ,mesa)))
+ ("libgl" ,libgl)))
(home-page "https://github.com/3b/cl-opengl")
(synopsis "Common Lisp bindings to OpenGL, GLU and GLUT APIs")
(description
@@ -16962,7 +16962,7 @@ (define-public sbcl-glop
(list libx11
libxcomposite
libxrandr
- mesa
+ libgl
sbcl-cffi
sbcl-split-sequence
sbcl-trivial-garbage))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 35/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (33 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 34/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 36/73] " The Man
` (37 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, Guillaume Le Vaillant, Katherine Cox-Buday,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
Change-Id: I64dffd671e2249d3f9d2877ebbd137083ea8d348
---
gnu/packages/lisp.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 543fbfc93e..1ec4559f6c 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -1007,7 +1007,7 @@ (define-public lush2
("gsl" ,gsl)
("openblas" ,openblas)
("glu" ,glu)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("mesa-utils" ,mesa-utils)
("binutils" ,binutils)
("libiberty" ,libiberty)
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 36/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (34 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 35/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 37/73] " The Man
` (36 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ia7515cbe4e6e3218df9cec6f98ed24351c9913f6
---
gnu/packages/machine-learning.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3696a81ea6..b38e987f9b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -525,7 +525,7 @@ (define-public guile-aiscm
libxpm
libxt
libxv
- mesa
+ libgl
mjpegtools
pandoc
pulseaudio
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 37/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (35 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 36/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 38/73] " The Man
` (35 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Andreas Enge, Eric Bavier, Sharlatan Hellseher
Change-Id: I5a2b1af5c58bcf1a482f53e2bfd53569f4b4ad3d
---
gnu/packages/maths.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9257a8adb7..3d3be983b2 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2960,7 +2960,7 @@ (define-public octave-cli
hdf5
libsndfile
libxft
- mesa
+ libgl
openblas
pcre
portaudio
@@ -3105,7 +3105,7 @@ (define-public opencascade-occt
libxext
libxi
libxmu
- mesa
+ libgl
tbb-2020
tcl
tk))
@@ -3219,7 +3219,7 @@ (define-public gmsh
hdf5
libx11
libxext
- mesa
+ libgl
metis
openblas
opencascade-occt))
@@ -8092,7 +8092,7 @@ (define-public mcrl2
(base32
"147002dl3gq2jsk5gcmvw7hj3mfxrpgxwcfda5mfrj26rcxw48fc"))))
(inputs
- (list boost glu mesa qtbase-5))
+ (list boost glu libgl qtbase-5))
(build-system cmake-build-system)
(synopsis "Toolset for the mCRL2 formal specification language")
(description
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 38/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (36 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 37/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 39/73] " The Man
` (34 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Adam Faiz, Liliana Marie Prikler,
宋文武
Change-Id: Ib0cf89f3bd38e2e7a26e81387e2a6e51666edcdc
---
gnu/packages/minetest.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 2552596ef8..eeadb3d18a 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -142,7 +142,7 @@ (define-public minetest
libxxf86vm
libxi
luajit
- mesa
+ libgl
ncurses
openal
sqlite
@@ -182,7 +182,7 @@ (define-public minetest-server
"libogg"
"libvorbis"
"libxxf86vm"
- "mesa"
+ "libgl"
"openal")))
(synopsis "Infinite-world block sandbox game (server)")
(description
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 39/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (37 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 38/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 40/73] " The Man
` (33 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I1e6707a1ec02772580fc11c439cdf60e44585fef
---
gnu/packages/music.scm | 44 +++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 4e4953af0c..5f27e06a82 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -347,7 +347,7 @@ (define-public audacious
libxrender
lirc
jack-1
- mesa
+ libgl
mpg123
neon
opusfile
@@ -1207,10 +1207,10 @@ (define-public extempore
("fft" "libkiss_fft.so" "kiss-fft")
("stb_image" "libstb_image.so" "stb-image")
("nanovg" "libnanovg.so" "nanovg")
- ("glext" "libGL.so" "mesa")
+ ("glext" "libGL.so" "libgl")
("glfw3" "libglfw.so" "glfw")
- ("gl/glcore-directbind" "libGL.so" "mesa")
- ("gl/glcompat-directbind" "libGL.so" "mesa")))
+ ("gl/glcore-directbind" "libGL.so" "libgl")
+ ("gl/glcompat-directbind" "libGL.so" "libgl")))
#t))
(add-after 'unpack 'use-own-llvm
(lambda* (#:key inputs #:allow-other-keys)
@@ -1310,7 +1310,7 @@ (define-public extempore
("assimp" ,assimp)
("alsa-lib" ,alsa-lib)
("portaudio" ,portaudio)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("pcre" ,pcre)
("zlib" ,zlib)))
(native-inputs
@@ -1625,7 +1625,7 @@ (define-public ninjas2
(list fftwf
jack-1 ; for the standalone JACK application
libsamplerate
- mesa
+ libgl
libsndfile))
(native-inputs
(list ladspa lv2 pkg-config))
@@ -3425,7 +3425,7 @@ (define-public zynaddsubfx
(inputs
(list liblo
ntk
- mesa
+ libgl
alsa-lib
jack-1
fftw
@@ -3493,7 +3493,7 @@ (define-public yoshimi
fontconfig
jack-2
lv2
- mesa
+ libgl
minixml
ncurses
readline
@@ -5770,7 +5770,7 @@ (define-public patchmatrix
(build-system meson-build-system)
(arguments '(#:tests? #f)) ; no test target
(inputs
- (list jack-1 lv2 mesa))
+ (list jack-1 lv2 libgl))
(native-inputs
(list pkg-config))
(home-page "https://github.com/OpenMusicKontrollers/patchmatrix")
@@ -5830,7 +5830,7 @@ (define-public fabla
(build-system cmake-build-system)
(arguments '(#:tests? #f)) ;there are none
(inputs (list ntk cairomm libsndfile))
- (native-inputs (list pkg-config lv2 mesa))
+ (native-inputs (list pkg-config lv2 libgl))
(home-page "http://openavproductions.com/fabla/")
(synopsis "Sampler LV2 plugin")
(description
@@ -6452,7 +6452,7 @@ (define-public lsp-plugins
libsndfile
libx11
libxrandr
- mesa))
+ libgl))
(native-inputs (list pkg-config php))
(outputs '("out" "doc" "lv2" "debug"))
(synopsis "Audio plugin collection")
@@ -6478,7 +6478,7 @@ (define-public sherlock-lv2
"08gjfx7vrsx9zvj04j8cr3vscxmq6jr2hbdi6dfgp1l1dnnpxsgq"))))
(build-system meson-build-system)
(inputs
- (list glu libx11 mesa sratom))
+ (list glu libx11 libgl sratom))
(native-inputs
(list flex pkg-config))
(synopsis "Investigative LV2 plugin bundle")
@@ -6563,7 +6563,7 @@ (define-public spectacle-analyzer
fftwf
jack-1
lv2
- mesa))
+ libgl))
(synopsis "Realtime graphical spectrum analyzer")
(description "Spectacle is a real-time spectral analyzer using the
short-time Fourier transform, available as LV2 audio plugin and JACK client.")
@@ -6691,7 +6691,7 @@ (define-public zam-plugins
jack-1 ;for the standalone JACK application
liblo
libsamplerate
- mesa
+ libgl
zita-convolver))
(native-inputs
(list ladspa lv2 pkg-config))
@@ -6865,7 +6865,7 @@ (define-public distrho-ports
libxcursor
libxext
libxrender
- mesa))
+ libgl))
(native-search-paths
(list (search-path-specification
(variable "VST2_PATH")
@@ -6974,7 +6974,7 @@ (define-public dpf-plugins
(list cairo
liblo ; for dssi plugins
jack-1 ; for standalone applications
- mesa))
+ libgl))
(native-inputs
(list pkg-config dssi lv2))
(home-page "https://github.com/DISTRHO/DPF-Plugins")
@@ -7019,7 +7019,7 @@ (define-public avldrums-lv2
(lambda _
(setenv "CC" "gcc"))))))
(inputs
- (list cairo dssi glu mesa pango))
+ (list cairo dssi glu libgl pango))
(native-inputs
(list pkg-config lv2))
(home-page "https://x42-plugins.com/x42/x42-avldrums")
@@ -7075,7 +7075,7 @@ (define-public helm
jack-1
libxcursor
libxinerama
- mesa))
+ libgl))
(native-inputs
(list lv2 pkg-config))
(home-page "https://tytel.org/helm/")
@@ -7272,7 +7272,7 @@ (define-public dragonfly-reverb
(native-inputs
(list pkg-config))
(inputs
- (list jack-1 libx11 mesa))
+ (list jack-1 libx11 libgl))
(home-page "https://michaelwillis.github.io/dragonfly-reverb/")
(synopsis "Concert hall reverb and room reverb effects")
(description
@@ -7366,7 +7366,7 @@ (define-public vl1-emulator
(modify-phases %standard-phases
(delete 'configure)))) ;no configure target
(inputs
- (list cairo jack-1 mesa))
+ (list cairo jack-1 libgl))
(native-inputs
(list pkg-config))
(home-page "https://github.com/linuxmao-org/VL1-emulator")
@@ -7519,7 +7519,7 @@ (define-public wolf-shaper
(native-inputs
(list pkg-config))
(inputs
- (list jack-1 lv2 mesa))
+ (list jack-1 lv2 libgl))
(synopsis "Waveshaper plugin")
(description "Wolf Shaper is a waveshaper plugin with a graph editor.
It is provided as an LV2 plugin and as a standalone Jack application.")
@@ -7604,7 +7604,7 @@ (define-public shiru-lv2
glu
jack-1
lv2
- mesa
+ libgl
pango))
(synopsis "Audio plugin collection")
(description "Shiru plugins is a collection of audio plugins created
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 40/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (38 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 39/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 41/73] " The Man
` (32 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I88fae694410044854cb93d3843124844a6f4a3ca
---
gnu/packages/pdf.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 24afadbe80..9f55ac8c80 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1277,7 +1277,7 @@ (define-public fbida
("freetype" ,freetype)
("fontconfig" ,fontconfig)
("libexif" ,libexif)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("libepoxy" ,libepoxy)
("libpng" ,libpng)
("poppler" ,poppler)))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 41/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (39 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 40/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 42/73] " The Man
` (31 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ica101024b6e4804f7786504519c7d1937f2a88e2
---
gnu/packages/perl.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index faaac13bf1..6c90fe7957 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -8547,7 +8547,7 @@ (define-public perl-opengl
(("-L/usr/local/freeglut/lib")
(string-append "-L" (assoc-ref inputs "freeglut") "/lib\n"
"-L" (assoc-ref inputs "glu") "/lib\n"
- "-L" (assoc-ref inputs "mesa") "/lib\n")))
+ "-L" (assoc-ref inputs "libgl") "/lib\n")))
#t)))))
(home-page "https://metacpan.org/release/OpenGL")
(synopsis
@@ -12352,7 +12352,7 @@ (define-public perl-sdl
libpng
libsmpeg
libtiff
- mesa
+ libgl
(sdl-union (list sdl
sdl-gfx
sdl-image
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 42/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (40 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 41/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 43/73] " The Man
` (30 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I712a153f15d8d0889ce7337cf68be91bf7c405c1
---
gnu/packages/photo.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index c9cf877085..4c2630f018 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -782,7 +782,7 @@ (define-public hugin
libtiff
libxi
libxmu
- mesa
+ libgl
openexr-2
sqlite
vigra
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 43/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (41 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 42/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 44/73] " The Man
` (29 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I7d387c7633b7b4b8e7b86a83105d9a8a551a1eb1
---
gnu/packages/profiling.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm
index 3862dc2e22..e0fe0573fb 100644
--- a/gnu/packages/profiling.scm
+++ b/gnu/packages/profiling.scm
@@ -454,7 +454,7 @@ (define-public tracy-wayland
dbus
freetype
libxkbcommon
- mesa
+ libgl
wayland
`(,zstd "lib")))
(native-inputs (list pkg-config))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 44/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (42 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 43/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 45/73] " The Man
` (28 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, Tanguy Le Carrour, jgart
Change-Id: Ib02f8c469979adbbf20f2872e50ebc175a777380
---
gnu/packages/python-graphics.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index 403a3c3b34..8ed16ef70b 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -61,21 +61,21 @@ (define-public python-glcontext
#~(modify-phases %standard-phases
(add-before 'build 'fix-lib-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((mesa (assoc-ref inputs "mesa"))
+ (let ((libgl (assoc-ref inputs "libgl"))
(libx11 (assoc-ref inputs "libx11")))
(substitute* '("glcontext/x11.cpp"
"glcontext/egl.cpp")
(("\"libGL.so\"")
- (string-append "\"" mesa "/lib/libGL.so\""))
+ (string-append "\"" libgl "/lib/libGL.so\""))
(("\"libEGL.so\"")
- (string-append "\"" mesa "/lib/libEGL.so\""))
+ (string-append "\"" libgl "/lib/libEGL.so\""))
(("\"libX11.so\"")
(string-append "\"" libx11 "/lib/libX11.so\"")))
(substitute* '("glcontext/__init__.py")
(("find_library\\('GL'\\)")
- (string-append "'" mesa "/lib/libGL.so'"))
+ (string-append "'" libgl "/lib/libGL.so'"))
(("find_library\\('EGL'\\)")
- (string-append "'" mesa "/lib/libEGL.so'"))
+ (string-append "'" libgl "/lib/libEGL.so'"))
(("find_library\\(\"X11\"\\)")
(string-append "'" libx11 "/lib/libX11.so'"))))))
(add-before 'check 'prepare-test-environment
@@ -84,7 +84,7 @@ (define-public python-glcontext
(setenv "DISPLAY" ":1"))))))
(inputs
(list libx11
- mesa))
+ libgl))
(native-inputs
(list python-psutil
python-pytest
@@ -157,7 +157,7 @@ (define-public python-pyglet
"pyglet/media/drivers/openal/lib_openal.py"
"pyglet/media/drivers/pulse/lib_pulseaudio.py")
(("'EGL'")
- (format #f "'~a/~a'" #$(this-package-input "mesa")
+ (format #f "'~a/~a'" #$(this-package-input "libgl")
"lib/libEGL.so"))
(("\"fontconfig\"")
(format #f "'~a/~a'" #$(this-package-input "fontconfig-minimal")
@@ -166,7 +166,7 @@ (define-public python-pyglet
(format #f "'~a/~a'" #$(this-package-input "freetype")
"lib/libfreetype.so"))
(("'GL'")
- (format #f "'~a/~a'" #$(this-package-input "mesa")
+ (format #f "'~a/~a'" #$(this-package-input "libgl")
"lib/libGL.so"))
(("'GLU'")
(format #f "'~a/~a'" #$(this-package-input "glu")
@@ -223,7 +223,7 @@ (define-public python-pyglet
libxext
libxinerama
libxxf86vm
- mesa
+ libgl
openal
pulseaudio))
(home-page "https://github.com/pyglet/pyglet")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 45/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (43 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 44/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 46/73] " The Man
` (27 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, Tanguy Le Carrour, jgart
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
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 46/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (44 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 45/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 47/73] " The Man
` (26 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Maxim Cournoyer, 宋文武
Change-Id: I95c1549e8b2d0af93dbba1d3b61156e3cb2c560a
---
gnu/packages/qt.scm | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 722448b4e4..59d39e96b3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -472,7 +472,7 @@ (define-public qtbase-5
(build-system gnu-build-system)
(outputs '("out" "debug"))
(propagated-inputs
- (list mesa
+ (list libgl
;; Use which the package, not the function
(@ (gnu packages base) which)))
(inputs
@@ -674,7 +674,7 @@ (define-public qtbase-5
;; libGL
(substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp"
(("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b)
- (string-append a (assoc-ref inputs "mesa") "/lib/lib" b)))
+ (string-append a (assoc-ref inputs "libgl") "/lib/lib" b)))
;; libXcursor
(substitute* "src/plugins/platforms/xcb/qxcbcursor.cpp"
(("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b)
@@ -1138,7 +1138,7 @@ (define-public qt3d-5
"0wyv60qjrk206gg7mcxrh21y6lghbf02akcx7yrdlxmndsq0sh2s"))))
(propagated-inputs `())
(native-inputs (list perl))
- (inputs (list mesa qtbase-5 vulkan-headers zlib))
+ (inputs (list libgl qtbase-5 vulkan-headers zlib))
(arguments
(list #:phases #~(modify-phases %standard-phases
(add-before 'configure 'configure-qmake
@@ -1231,7 +1231,7 @@ (define-public qtsvg-5
(propagated-inputs `())
(native-inputs (list perl))
(inputs
- (list mesa qtbase-5 zlib))
+ (list libgl qtbase-5 zlib))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1310,7 +1310,7 @@ (define-public qtsvg
(lambda _
(delete-file-recursively (string-append #$output "/tests")))))))
(native-inputs (list perl))
- (inputs (list libxkbcommon mesa qtbase zlib))
+ (inputs (list libxkbcommon libgl qtbase zlib))
(synopsis "Qt module for displaying SVGs")
(description "The QtSvg module provides classes for displaying the
contents of SVG files.")
@@ -1338,7 +1338,7 @@ (define-public qtimageformats-5
libmng
libtiff
libwebp
- mesa
+ libgl
qtbase-5
zlib))
(synopsis "Additional Image Format plugins for Qt")
@@ -1370,7 +1370,7 @@ (define-public qtimageformats
libmng
libtiff
libwebp
- mesa
+ libgl
qtbase
zlib))
(synopsis "Additional Image Format plugins for Qt")
@@ -1394,7 +1394,7 @@ (define-public qtx11extras
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (list perl))
(inputs
- (list mesa qtbase-5))
+ (list libgl qtbase-5))
(synopsis "Qt Extras for X11")
(description "The QtX11Extras module includes the library to access X11
from within Qt 5.")))
@@ -1512,7 +1512,7 @@ (define-public qtdeclarative-5
qtsvg-5
vulkan-headers))
(inputs
- (list mesa qtbase-5))
+ (list libgl qtbase-5))
(synopsis "Qt QML module (Quick 2)")
(description "The Qt QML module provides a framework for developing
applications and libraries with the QML language. It defines and implements the
@@ -1665,7 +1665,7 @@ (define-public qtdeclarative
(inputs
(list at-spi2-core
libxkbcommon
- mesa
+ libgl
qtbase
qtimageformats
qtlanguageserver
@@ -1874,7 +1874,7 @@ (define-public qtmultimedia-5
(list perl pkg-config python qtdeclarative-5))
(inputs
(list alsa-lib
- mesa
+ libgl
pulseaudio
qtbase-5
;; Gstreamer is needed for the mediaplayer plugin
@@ -1977,7 +1977,7 @@ (define-public qtmultimedia
gst-plugins-good ;camera support, additional plugins
gst-libav ;ffmpeg plugin
libxkbcommon
- mesa
+ libgl
qtbase
qtdeclarative
pulseaudio))
@@ -2036,7 +2036,7 @@ (define-public qtwayland-5
libxext
libxkbcommon
libxrender
- mesa
+ libgl
mtdev
qtbase-5
vulkan-headers
@@ -2091,7 +2091,7 @@ (define-public qtwayland
libxext
libxkbcommon
libxrender
- mesa
+ libgl
mtdev
qtbase
vulkan-headers
@@ -2272,7 +2272,7 @@ (define-public qtwebglplugin
(substitute* "tests/plugins/platforms/platforms.pro"
(("webgl") "# webgl"))))))))
(native-inputs '())
- (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
+ (inputs (list libgl qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(synopsis "QPA plugin for running applications via a browser using
streamed WebGL commands")
(description "Qt back end that uses WebGL for rendering. It allows Qt
@@ -2432,7 +2432,7 @@ (define-public qttools-5
(format #f "QLatin1String(~s)"
(search-input-file inputs "bin/qmake"))))))))))
(native-inputs (list perl qtdeclarative-5 vulkan-headers))
- (inputs (list mesa qtbase-5))
+ (inputs (list libgl qtbase-5))
(synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse
the documentation, translate applications, generate help files and other stuff
@@ -2468,7 +2468,7 @@ (define-public qttools
(native-inputs (list perl qtdeclarative vulkan-headers))
;; Use clang-15, which is built using as a single shared library, which is
;; what the build system of qttools expects.
- (inputs (list clang-15 libxkbcommon mesa qtbase `(,zstd "lib")))
+ (inputs (list clang-15 libxkbcommon libgl qtbase `(,zstd "lib")))
(home-page (package-home-page qtbase))
(synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse
@@ -3330,7 +3330,7 @@ (define-public qtwebengine-5
libxrender
libxslt
libxtst
- mesa
+ libgl
minizip
nss
opus
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 47/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (45 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 46/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 48/73] " The Man
` (25 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Philip McGrath
Change-Id: I52a2d15d8abd6a8ade02837ed293445685da3e3e
---
gnu/packages/racket.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 1016915b47..424570ee19 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -669,7 +669,7 @@ (define-public racket
libjpeg-turbo
libpng
libx11 ;; ?? wayland ??
- mesa
+ libgl
mpfr
pango
unixodbc
@@ -1012,7 +1012,7 @@ (define-public racket
"libjpeg-turbo"
"libpng"
"libx11"
- "mesa"
+ "libgl"
"mpfr"
"pango"
"unixodbc"
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 48/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (46 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 47/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 49/73] " The Man
` (24 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I20886ca44e26a20d8a520ad9812b7345f0d05b09
---
gnu/packages/robotics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 949978d5dd..99ee50c2ba 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -59,7 +59,7 @@ (define-public enki
(propagated-inputs
;; 'Viewer.h' includes 'QGLWidget'.
(list qtbase-5 ;the viewer module needs Qt5 + MESA
- mesa))
+ libgl))
(synopsis "Robot simulator")
(description
"Enki is a robot simulator written in C++. It provides collision and
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 49/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (47 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 48/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 50/73] " The Man
` (23 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I8bca2c8b38714fad6a9734ec188d619a0aa79e4e
---
gnu/packages/rocm.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm
index e883371928..7ed2084e9e 100644
--- a/gnu/packages/rocm.scm
+++ b/gnu/packages/rocm.scm
@@ -242,7 +242,7 @@ (define-public rocm-opencl-runtime
(lambda _ (display sopath)))))))))
(inputs
(list glew
- mesa
+ libgl
numactl
opencl-headers
opencl-icd-loader
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 50/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (48 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 49/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 51/73] " The Man
` (22 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I1a39f5625b6279de63d1ab252781ca6e12eada08
---
gnu/packages/sdl.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 227846c042..736dc1470f 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -116,7 +116,7 @@ (define-public sdl2
;; TODO: Since building Mesa with Meson it is now necessary that Mesa is
;; a propogated input. We still need to figure out why, possibly due to a
;; change in pkg-config.
- mesa))
+ libgl))
(native-inputs (list pkg-config))
(inputs
;; SDL2 needs to be built with ibus support otherwise some systems
@@ -444,7 +444,7 @@ (define-public sdl-ttf
(snippet '(delete-file-recursively "external"))))
(build-system gnu-build-system)
(propagated-inputs (list sdl))
- (inputs (list freetype mesa))
+ (inputs (list freetype libgl))
(native-inputs (list pkg-config))
(outputs '("out" "debug"))
(synopsis "SDL TrueType font library")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 51/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (49 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 50/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 52/73] " The Man
` (21 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I368c19389c7b3748b11456f8b7a9d3e03596a538
---
gnu/packages/simulation.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 824318bf51..aa9193e888 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -542,7 +542,7 @@ (define-public esmini
(rename-file f (string-append out "/lib/"
(basename f))))
(find-files "." "\\.(a|so)$")))))))))
- (inputs (list mesa
+ (inputs (list libgl
openscenegraph `(,openscenegraph "pluginlib")
open-simulation-interface
protobuf pugixml sumo))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 52/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (50 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 51/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 53/73] " The Man
` (20 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ic08767f7a875e127f86718a25a3e6c4de24de158
---
gnu/packages/smalltalk.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm
index 88a1bbc2c2..a3c08b55db 100644
--- a/gnu/packages/smalltalk.scm
+++ b/gnu/packages/smalltalk.scm
@@ -152,7 +152,7 @@ (define-public squeak-vm
freetype
libffi
libxrender
- mesa
+ libgl
pulseaudio))
(native-inputs
(list pkg-config))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 53/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (51 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 52/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 54/73] " The Man
` (19 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I4bf2853eb002c4d3689fa0af57cf354c450c4c23
---
gnu/packages/spice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index d85e7737fd..ffbb3c9f75 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -101,7 +101,7 @@ (define-public virglrenderer
(base32
"0xw2qk8557gqpm1ssgk3ccshgljm6sh3wbbwpsp9cl0h4hdf2wq2"))))
(build-system meson-build-system)
- (inputs (list libepoxy mesa))
+ (inputs (list libepoxy libgl))
(native-inputs (list pkg-config python))
(synopsis "Virtual 3D GPU library")
(description "A virtual 3D GPU library that enables a virtualized operating
@@ -203,7 +203,7 @@ (define-public spice-gtk
libcap-ng
libepoxy
libxcb
- mesa
+ libgl
polkit
pulseaudio
usbutils))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 54/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (52 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 53/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 55/73] " The Man
` (18 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I5a96337ba67c39107e135261e4ee8c6158378f2e
---
gnu/packages/telegram.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index cfcd92fcbc..ea16fe5907 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -335,7 +335,7 @@ (define-public webrtc-for-telegram-desktop
glib
glibmm
libdrm
- libglvnd
+ ;;libglvnd
libjpeg-turbo
libsrtp
libvpx
@@ -346,7 +346,7 @@ (define-public webrtc-for-telegram-desktop
libxrandr
libxrender
libxtst
- mesa
+ libgl
openh264
openssl
opus
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 55/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (53 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 54/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 56/73] " The Man
` (17 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Maxim Cournoyer
Change-Id: Ib16e82278ba1490592c33b59ee46c0126cb91e2b
---
gnu/packages/telephony.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 2cba0296e6..37ce492719 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -646,7 +646,7 @@ (define-public mumble
glib ; for speech-dispatcher
libsndfile
libxi
- mesa ; avoid bundled
+ libgl ; avoid bundled
nlohmann-json ; avoid bundled
openssl
opus ; avoid bundled
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 56/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (54 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 55/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 57/73] " The Man
` (16 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I131d1bdae86c899408b0800380e8866601a65f0d
---
gnu/packages/terminals.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index fbfc4439db..975c52e4d8 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1320,7 +1320,7 @@ (define-public kitty
(build-system gnu-build-system)
(native-inputs
(list dbus
- mesa
+ libgl
libxcursor
libxi
libxinerama
@@ -1695,7 +1695,7 @@ (define-public alacritty
libxt
libxtst
libxxf86vm
- mesa
+ libgl
xdg-utils
wayland))
(native-search-paths
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 57/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (55 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 56/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 58/73] " The Man
` (15 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ie4793c9b927e0d49aa466f0113f081c34c1b4482
---
gnu/packages/toolkits.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm
index 3ba3399899..77128cc6a4 100644
--- a/gnu/packages/toolkits.scm
+++ b/gnu/packages/toolkits.scm
@@ -125,7 +125,7 @@ (define-public imgui
(copy-recursively "examples"
(string-append #$output:doc
"/share/imgui/examples"))))))))
- (inputs (list fontconfig freetype glfw mesa sdl2))
+ (inputs (list fontconfig freetype glfw libgl sdl2))
(home-page "https://github.com/ocornut/imgui")
(synopsis "Immediate-mode C++ GUI library with minimal dependencies")
(description "@code{dear imgui} (also know as ImGui) is a graphical user
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 58/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (56 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 57/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 59/73] " The Man
` (14 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522
Cc: The Man, André Batista, Clément Lassieur,
Jonathan Brielmaier, Mark H Weaver
Change-Id: Iba78ca0ef8a2c78278308fd34e4127c69ce0684c
---
gnu/packages/tor-browsers.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index e517f9b214..581e4013ba 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -251,7 +251,7 @@ (define* (make-torbrowser #:key
icu4c-73
pixman
pulseaudio
- mesa
+ libgl
pciutils
mit-krb5
hunspell
@@ -457,7 +457,7 @@ (define* (make-torbrowser #:key
`(,(string-append (assoc-ref inputs "shared-mime-info")
"/share/mime")
,@(append-map runpaths-of-input
- '("mesa" "ffmpeg"))))))
+ '("libgl" "ffmpeg"))))))
(whitelist-string (string-join whitelist ",")))
(with-output-to-file "whitelist.txt"
(lambda ()
@@ -654,7 +654,7 @@ (define* (make-torbrowser #:key
(file-append (this-package-input label) "/lib"))
'("libpng-apng"
"libxscrnsaver"
- "mesa"
+ "libgl"
"pciutils"
"mit-krb5"
"eudev"
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 59/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (57 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 58/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 60/73] " The Man
` (13 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ib857d54796f9447e0ea4aae1a9c145668903c912
---
gnu/packages/version-control.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..9e0e0f75b1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3434,7 +3434,7 @@ (define-public gource
glm
glu
libpng
- mesa
+ libgl
pcre2
(sdl-union (list sdl2 sdl2-image))
tinyxml))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 60/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (58 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 59/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 61/73] " The Man
` (12 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
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
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 61/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (59 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 60/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 62/73] " The Man
` (11 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Sharlatan Hellseher
Change-Id: Ibc1d0055df2212696ccd1b42503b7c275301bd6d
---
gnu/packages/virtualization.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b76180c3c6..876b0c31b6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -518,7 +518,7 @@ (define-public qemu
libslirp
liburing
libusb ;USB pass-through support
- mesa
+ libgl
ncurses
openbios-qemu-ppc
opensbi-qemu
@@ -662,7 +662,7 @@ (define-public qemu-minimal
(delete "gettext-minimal"))))
(inputs (modify-inputs (package-inputs qemu)
(delete "libusb"
- "mesa"
+ "libgl"
"sdl2"
"spice"
"virglrenderer"
@@ -2166,7 +2166,7 @@ (define-public looking-glass-client
freetype
glu
gmp
- libglvnd
+ ;;libglvnd
libiberty
libsamplerate
libx11
@@ -2178,7 +2178,7 @@ (define-public looking-glass-client
libxpresent
libxrandr
libxscrnsaver
- mesa
+ libgl
pipewire
pulseaudio
spice-protocol
@@ -2214,7 +2214,7 @@ (define-public looking-glass-client
(string-append input "/lib")))
'("gmp" "libxi"
"nettle"
- "mesa"
+ "libgl"
"wayland"
"fontconfig-minimal"
"freetype"
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 62/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (60 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 61/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 63/73] " The Man
` (10 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ief9fd139060190752ba660a138ff24257aefdc54
---
gnu/packages/vnc.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 4f780a55dd..fd97b41700 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -553,7 +553,7 @@ (define-public turbovnc
libxi
libxkbfile
linux-pam
- mesa
+ libgl
openjdk
openssh
openssl
@@ -695,7 +695,7 @@ (define-public neatvnc
(build-system meson-build-system)
(native-inputs (list pkg-config))
(inputs
- (list libdrm libglvnd libxkbcommon pixman aml gnutls libjpeg-turbo zlib))
+ (list libdrm libgl libxkbcommon pixman aml gnutls libjpeg-turbo zlib))
(home-page "https://github.com/any1/neatvnc")
(synopsis "Lightweight VNC server library")
(description "NeatVNC is a lightweight VNC server library, supporting
@@ -730,7 +730,7 @@ (define-public wayvnc
jansson
libdrm
pixman
- libglvnd
+ libgl
libxkbcommon
wayland))
(home-page "https://github.com/any1/wayvnc")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 63/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (61 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 62/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 64/73] " The Man
` (9 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Ibb6a6c2eb0e84b9de53cdcc402d7653c82af5797
---
gnu/packages/vpn.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 9648c502cc..6488894fc5 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -260,7 +260,7 @@ (define-public bitmask
(inputs
`(("iproute" ,iproute)
("iptables" ,iptables)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("openvpn" ,openvpn)
("polkit" ,polkit)
("procps" ,procps)
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 64/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (62 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 63/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 65/73] " The Man
` (8 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I484ebbb27222fe52251e427b03f43748520dfd76
---
gnu/packages/vulkan.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index dd5b51c7fe..7b8f2fcfc1 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -597,7 +597,7 @@ (define-public vulkan-validationlayers
(build-system cmake-build-system)
(inputs (list glslang
libxrandr
- mesa
+ libgl
robin-hood-hashing
shaderc
spirv-tools
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 65/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (63 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 64/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:41 ` [bug#74522] [PATCH 66/73] " The Man
` (7 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man, Liliana Marie Prikler, Maxim Cournoyer, Vivien Kraus
Change-Id: I023b244e23130a35317c14ffe121a0d5b6b19d99
---
gnu/packages/webkit.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index b71e7e3e29..4b93ff0609 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -90,7 +90,7 @@ (define-public libwpe
`(("pkg-config" ,pkg-config)
("python" ,python-wrapper)))
(inputs
- (list mesa))
+ (list libgl))
(propagated-inputs
(list libxkbcommon))
(synopsis "General-purpose library for WPE")
@@ -116,7 +116,7 @@ (define-public wpebackend-fdo
(native-inputs
(list pkg-config))
(inputs
- (list glib libepoxy libwpe mesa wayland))
+ (list glib libepoxy libwpe libgl wayland))
(home-page "https://wpewebkit.org/")
(synopsis "Wayland WPE backend")
(description
@@ -267,7 +267,7 @@ (define-public webkitgtk
libxml2
libxslt
libxt
- mesa
+ libgl
openjpeg
sqlite
woff2
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 66/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (64 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 65/73] " The Man
@ 2024-11-25 3:41 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 67/73] " The Man
` (6 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:41 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I841e152b46270d294dc4b74ffab6e42b0a215b90
---
gnu/packages/wine.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm
index 0e1195b6ed..dfd33ce352 100644
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@@ -199,7 +199,7 @@ (define-public wine
libxinerama
libxxf86vm
libxcomposite
- mesa
+ libgl
mit-krb5
openal
pulseaudio
@@ -371,7 +371,7 @@ (define-public wine-staging
ffmpeg
gtk+
libva
- mesa
+ libgl
python
util-linux ; for hexdump
wine-staging-patchset-data)))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 67/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (65 preceding siblings ...)
2024-11-25 3:41 ` [bug#74522] [PATCH 66/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 68/73] " The Man
` (5 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I15af52e5112493cf152498ffcb7b674d603bf501
---
gnu/packages/wm.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 921f975037..2975a25495 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -494,7 +494,7 @@ (define-public i3lock-blur
(list pkg-config automake autoconf))
(inputs
(list cairo
- mesa
+ libgl
libev
linux-pam
libxcb
@@ -1759,7 +1759,7 @@ (define-public wlroots
libdisplay-info
libinput-minimal
libxkbcommon
- mesa
+ libgl
pixman
libseat
wayland
@@ -1852,7 +1852,7 @@ (define-public wl-mirror
(string-append "-DWLR_PROTOCOL_DIR="
#$(this-package-input "wlr-protocols")
"/share/wlr-protocols"))))
- (inputs (list egl-wayland mesa wayland wayland-protocols wlr-protocols))
+ (inputs (list egl-wayland libgl wayland wayland-protocols wlr-protocols))
(native-inputs (list pkg-config scdoc))
(home-page "https://github.com/Ferdi265/wl-mirror")
(synopsis "Simple Wayland output mirror client")
@@ -1945,7 +1945,7 @@ (define-public sway
wayland
wlroots))
(native-inputs
- (cons* linux-pam mesa pkg-config scdoc wayland-protocols
+ (cons* linux-pam libgl pkg-config scdoc wayland-protocols
(if (%current-target-system)
(list pkg-config-for-build
wayland)
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 68/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (66 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 67/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 69/73] " The Man
` (4 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I88565df59ab747ddacc6ff2a51e831bec3a70b69
---
gnu/packages/wxwidgets.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 11c2ac2154..c278abd98c 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -114,7 +114,7 @@ (define-public wxwidgets
libsm
libtiff
libxtst ;for wxUIActionSimulator
- mesa
+ libgl
pcre2
sdl2
shared-mime-info
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 69/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (67 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 68/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 70/73] " The Man
` (3 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: If75c4061dff9b011a430997c40bef94abf500567
---
gnu/packages/xdisorg.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index a75e9cd6ba..2502f024a2 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1033,7 +1033,7 @@ (define-public slop
icu4c
libxext
libxrender
- mesa))
+ libgl))
(home-page "https://github.com/naelstrof/slop")
(synopsis "Select a region and print its bounds to stdout")
(description
@@ -1068,7 +1068,7 @@ (define-public maim
libxfixes
libxrandr
libwebp
- mesa
+ libgl
slop
zlib))
(home-page "https://github.com/naelstrof/maim")
@@ -3878,7 +3878,7 @@ (define-public xforms-gl
(package/inherit xforms
(name "xforms-gl")
(propagated-inputs (modify-inputs (package-propagated-inputs xforms)
- (append mesa)))
+ (append libgl)))
(synopsis
"GUI toolkit for X based on the X11 Xlib library, with OpenGL support")))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 70/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (68 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 69/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 71/73] " The Man
` (2 subsequent siblings)
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I6e426b25dbd4484e004da2ef5e951eaea2e1caf7
---
gnu/packages/xorg.scm | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 554dc21ba7..b296467132 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2348,7 +2348,7 @@ (define-public xdriinfo
"0d7p9fj3znq0av9pjgi2kphqaz5w7b9hxlz63zbxs69bknp8p0yx"))))
(build-system gnu-build-system)
(inputs
- (list mesa libx11))
+ (list libgl libx11))
(native-inputs
(list pkg-config))
(home-page "https://www.x.org/wiki/")
@@ -2726,7 +2726,7 @@ (define-public xf86-video-ati
(sha256
(base32 "1n49wx0v13jh8vv17sxgrmmpi1mk3n2wph07jfmxmzqahpcn4lkn"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs
(list pkg-config autoconf automake libtool))
(home-page "https://www.x.org/wiki/")
@@ -2825,7 +2825,7 @@ (define-public xf86-video-freedreno
(build-system gnu-build-system)
(inputs
`(("libdrm" ,libdrm)
- ("mesa" ,mesa)
+ ("libgl" ,libgl)
("udev" ,eudev)
("xorg-server" ,xorg-server)
("zlib" ,zlib)))
@@ -2946,7 +2946,7 @@ (define-public xf86-video-intel
"0lv6vlx9gvp34pidmx4gxgb0qjf0km0gabbaxw141nnvj1azv94y"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
- (inputs `(("mesa" ,mesa)
+ (inputs `(("libgl" ,libgl)
("udev" ,eudev)
("libx11" ,libx11)
("libxfont" ,libxfont2)
@@ -2982,7 +2982,7 @@ (define-public xf86-video-mach64
(base32
"1fl1jjx0zdr9alkxw23zx6aj1bj4l8inz5w7y7k2g0kwzazqmmsh"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs
(list pkg-config))
(home-page "https://www.x.org/wiki/")
@@ -3010,7 +3010,7 @@ (define-public xf86-video-mga
(base32
"1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs (list pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "Matrox video driver for X server")
@@ -3151,7 +3151,7 @@ (define-public xf86-video-r128
(base32
"0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs
(list pkg-config))
(home-page "https://www.x.org/wiki/")
@@ -3177,7 +3177,7 @@ (define-public xf86-video-savage
(base32
"11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs (list pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "Savage video driver for X server")
@@ -3225,7 +3225,7 @@ (define-public xf86-video-sis
(base32
"0nrs6cjldlhakx5987fiiggjrlzilsbdc7l9pz22x1iwslbkz78i"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs
(list pkg-config))
(home-page "https://www.x.org/wiki/")
@@ -3250,7 +3250,7 @@ (define-public xf86-video-tdfx
(base32
"0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"))))
(build-system gnu-build-system)
- (inputs (list mesa xorgproto xorg-server))
+ (inputs (list libgl xorgproto xorg-server))
(native-inputs (list pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "3Dfx video driver for X server")
@@ -3403,7 +3403,7 @@ (define-public xf86-video-vmware
(list libx11
libxext
llvm
- mesa ; for xatracker
+ libgl ; for xatracker
xorg-server))
(native-inputs
(list eudev pkg-config))
@@ -5055,7 +5055,7 @@ (define-public xorg-server
(build-system gnu-build-system)
(propagated-inputs
;; The following libraries are required by xorg-server.pc.
- (list libpciaccess libxcvt mesa pixman xorgproto))
+ (list libpciaccess libxcvt libgl pixman xorgproto))
(inputs
`(("udev" ,eudev)
("dbus" ,dbus)
@@ -5243,7 +5243,7 @@ (define-public egl-gbm
(base32 "125h1751vdg60klci0cbmcqj46spxalzqawvvd469qvx69bm30da"))))
(build-system meson-build-system)
(native-inputs (list pkg-config))
- (inputs (list eglexternalplatform mesa))
+ (inputs (list eglexternalplatform libgl))
(synopsis "GBM EGL external platform library")
(description
"This package provides an EGL External Platform library implementation for
@@ -5266,13 +5266,13 @@ (define-public egl-wayland
(base32 "0irmvp8g2wn18q6k3vcmg4a57q4ddmqccv3g7hbysqnsdsps63rl"))))
(build-system meson-build-system)
(native-inputs
- (cons* libglvnd ;needed for headers
+ (cons* libgl ;needed for headers
mesa-headers pkg-config
(if (%current-target-system)
(list pkg-config-for-build wayland wayland-protocols)
'())))
(inputs
- (list mesa wayland wayland-protocols))
+ (list libgl wayland wayland-protocols))
(propagated-inputs
(list eglexternalplatform))
(synopsis "EGLStream-based Wayland external platform")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 71/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (69 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 70/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 72/73] move libgl provider from mesa to libglvnd+mesa TEMP The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 73/73] move libgl provider from mesa to libglvnd+mesa The Man
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: Icbeea1413c55f01313c51c1f28555b449be18ebf
---
gnu/services/xorg.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index eff1c9354b..e6165c9022 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -376,7 +376,7 @@ (define (xorg-configuration-server-package-path config input path)
(when package (file-append package path))))
(define (xorg-configuration-dri-driver-path config)
- (xorg-configuration-server-package-path config "mesa" "/lib/dri"))
+ (xorg-configuration-server-package-path config "libgl" "/lib/dri"))
(define (xorg-configuration-xkb-bin-dir config)
(xorg-configuration-server-package-path config "xkbcomp" "/bin"))
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 72/73] move libgl provider from mesa to libglvnd+mesa TEMP
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (70 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 71/73] " The Man
@ 2024-11-25 3:42 ` The Man
2024-11-25 3:42 ` [bug#74522] [PATCH 73/73] move libgl provider from mesa to libglvnd+mesa The Man
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I3ba541942b0557938c7ac41678725c98d438c5de
---
gnu/packages/kde-plasma.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 36e0587706..1579a33567 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -1435,6 +1435,17 @@ (define-public kwin
#$@(if (target-aarch64?)
#~("kwin-testColorspaces")
#~())
+ "kwin-testLockScreen"
+ "kwin-testTabBox"
+ "kwin-testKeyboardLayout"
+ "kwin-testQuickTiling"
+ "kwin-testDbusInterface"
+ "kwin-testVirtualKeyboardDBus"
+ "kwin-testGlobalShortcuts"
+ "kwin-testKWinBindings"
+ "kwin-testMinimizeAllScript"
+ "kwin-testLibinputDevice"
+ ;; test
"kwin-testDrm" ;; require Drm
"kwin-testInputMethod"
"kwin-testPlasmaWindow" ;; require plasma-workspace qml module.
@@ -1501,7 +1512,7 @@ (define-public kwin
lcms
libcap
libepoxy
- libglvnd ; For OpenGLES
+ libgl ; For OpenGLES
libinput
libxkbcommon
pipewire
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread* [bug#74522] [PATCH 73/73] move libgl provider from mesa to libglvnd+mesa
2024-11-25 3:38 [bug#74522] [PATCH 00/73] Moving Guix to libglvnd The Man
` (71 preceding siblings ...)
2024-11-25 3:42 ` [bug#74522] [PATCH 72/73] move libgl provider from mesa to libglvnd+mesa TEMP The Man
@ 2024-11-25 3:42 ` The Man
72 siblings, 0 replies; 75+ messages in thread
From: The Man @ 2024-11-25 3:42 UTC (permalink / raw)
To: 74522; +Cc: The Man
Change-Id: I3e9235f3d9755058462679ebd63de0484384d184
---
gnu/packages/gl.scm | 155 ++++++++++++++++++++++++++++++++++----------
1 file changed, 122 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 0a285dfc30..81803519de 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -74,6 +74,7 @@ (define-module (gnu packages gl)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
+ #:use-module (guix build-system trivial)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix gexp)
@@ -102,7 +103,7 @@ (define-public glu
automake
libtool))
(propagated-inputs
- (list mesa)) ; according to glu.pc
+ (list libgl)) ; according to glu.pc
(home-page "http://www.opengl.org/archives/resources/faq/technical/glu.htm")
(synopsis "Mesa OpenGL Utility library")
(description
@@ -137,7 +138,7 @@ (define-public freeglut
(inputs (list libx11 libxi libxrandr libxxf86vm))
(propagated-inputs
;; Headers from Mesa and GLU are needed.
- (list glu mesa))
+ (list glu libgl))
(home-page "https://freeglut.sourceforge.net/")
(synopsis "Alternative to the OpenGL Utility Toolkit (GLUT)")
(description
@@ -189,7 +190,7 @@ (define-public ftgl
`(#:configure-flags '("--disable-static")))
;; The pkg-config file lists "freetype2" as Requires.private.
(propagated-inputs (list freetype))
- (inputs (list libx11 mesa glu))
+ (inputs (list libx11 libgl glu))
(native-inputs
(list pkg-config autoconf automake libtool))
(synopsis "Font rendering library for OpenGL applications")
@@ -292,7 +293,7 @@ (define libva-without-mesa
(inherit libva)
(name "libva-without-mesa")
(inputs (fold alist-delete (package-inputs libva)
- '("mesa" "wayland")))
+ '("libgl" "wayland")))
(arguments
(strip-keyword-arguments
'(#:make-flags)
@@ -329,6 +330,7 @@ (define-public mesa
(list elfutils ;libelf required for r600 when using llvm
expat
(force libva-without-mesa)
+ libglvnd-headers
libxml2
libxrandr
libxvmc
@@ -398,6 +400,8 @@ (define-public mesa
;; "-Domx=true"
"-Dosmesa=true"
"-Dgallium-xa=enabled"
+ ;; libglvnd support
+ "-Dglvnd=true"
;; features required by wayland
"-Dgles2=enabled"
@@ -634,7 +638,14 @@ (define-public mesa
(((string-append "\"lib" layer-name ".so\""))
(string-append "\"" out "/lib/lib" layer-name ".so\"")))))))
(for-each fix-layer-path '("VkLayer_MESA_device_select"
- "VkLayer_MESA_overlay"))))))))
+ "VkLayer_MESA_overlay")))))
+ (add-after 'install 'fix-egl-vendor-path
+ (lambda _
+ (substitute*
+ (string-append #$output
+ "/share/glvnd/egl_vendor.d/50_mesa.json")
+ (("libEGL_mesa")
+ (string-append #$output "/lib/libEGL_mesa"))))))))
(native-search-paths
(list (search-path-specification
;; Ensure the Mesa VDPAU drivers can be found.
@@ -721,7 +732,7 @@ (define-public mesa-utils
(source (mesa-demos-source version))
(build-system gnu-build-system)
(inputs
- (list mesa freeglut glew))
+ (list libgl freeglut glew))
(native-inputs
(list pkg-config))
(arguments
@@ -782,7 +793,7 @@ (define-public glew
(delete-file (string-append #$output "/lib/libGLEW.a")))))
#:tests? #f)) ;no 'check' target
(inputs
- (list libxi libxmu libx11 mesa))
+ (list libxi libxmu libx11 libgl))
;; <GL/glew.h> includes <GL/glu.h>.
(propagated-inputs (list glu))
@@ -809,7 +820,7 @@ (define-public guile-opengl
"0rbc2wf9x63ilj3n85h8wyllzc2b22abmhs2p2ghjgc253n8gw5q"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config))
- (inputs (list guile-2.2 mesa glu freeglut))
+ (inputs (list guile-2.2 libgl glu freeglut))
(arguments
'(#:phases (modify-phases %standard-phases
(add-before 'build 'patch-dynamic-link
@@ -817,7 +828,7 @@ (define-public guile-opengl
(substitute* "gl/runtime.scm"
(("\\(dynamic-link\\)")
(string-append "(dynamic-link \""
- (assoc-ref inputs "mesa")
+ (assoc-ref inputs "libgl")
"/lib/libGL.so" "\")")))
(define (dynamic-link-substitute file lib input)
(substitute* file
@@ -827,7 +838,7 @@ (define-public guile-opengl
"/lib/lib" lib "\""))))
;; Replace dynamic-link calls for libGL, libGLU, and
;; libglut with absolute paths to the store.
- (dynamic-link-substitute "glx/runtime.scm" "GL" "mesa")
+ (dynamic-link-substitute "glx/runtime.scm" "GL" "libgl")
(dynamic-link-substitute "glu/runtime.scm" "GLU" "glu")
(dynamic-link-substitute "glut/runtime.scm" "glut"
"freeglut"))))))
@@ -843,7 +854,7 @@ (define-public guile3.0-opengl
(inherit guile-opengl)
(name "guile3.0-opengl")
(inputs
- (list guile-3.0 mesa glu freeglut))))
+ (list guile-3.0 libgl glu freeglut))))
(define-public libepoxy
(package
@@ -863,20 +874,20 @@ (define-public libepoxy
#~(modify-phases %standard-phases
(add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let ((mesa-lib
+ (let ((libgl-lib
(lambda (file)
(search-input-file inputs (string-append "lib/" file)))))
(substitute* (find-files "." "\\.[ch]$")
- (("libGL.so.1") (mesa-lib "libGL.so.1"))
- (("libEGL.so.1") (mesa-lib "libEGL.so.1"))
- (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1"))
- (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2")))))))))
+ (("libGL.so.1") (libgl-lib "libGL.so.1"))
+ (("libEGL.so.1") (libgl-lib "libEGL.so.1"))
+ (("libGLESv1_CM.so.1") (libgl-lib "libGLESv1_CM.so.1"))
+ (("libGLESv2.so.2") (libgl-lib "libGLESv2.so.2")))))))))
(build-system meson-build-system)
(native-inputs
(list pkg-config python))
(propagated-inputs
;; epoxy.pc: 'Requires.private: gl egl'
- (list mesa))
+ (list libgl))
(synopsis "Library for handling OpenGL function pointer management")
(description
"A library for handling OpenGL function pointer management.")
@@ -897,21 +908,46 @@ (define-public libglvnd
(base32
"07v3bmwzmg0d4g2zp835v1g7j22j8vz7hjfmqrdqjgxjj6v4jkyr"))))
(build-system meson-build-system)
- (arguments
- '(#:configure-flags '("-Dx11=enabled")
- #:phases (modify-phases %standard-phases
+ (arguments (list
+ #:configure-flags #~(list
+ "-Dx11=enabled"
+ (string-append "-Dc_link_args=-Wl,-rpath=$ORIGIN:"
+ ;; or else runpath errors with libGLdispatch.so
+ #$(this-package-input "mesa") "/lib"))
+ ;; we also need mesa visibility at te very least
+ #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-glx-tests
(lambda _
- ;; This package is meant to be used alongside Mesa.
+ ;; This package is meant to be used alongside mesonMesa.
;; To avoid a circular dependency, disable tests that
;; require a running Xorg server.
(substitute* "tests/meson.build"
(("if with_glx")
- "if false")))))))
+ "if false"))))
+ (delete 'shrink-runpath) ;; don't erase our hard work
+ (add-after 'install 'add-external-egl
+ (lambda _
+ (mkdir-p (string-append #$output
+ "/share/egl/egl_external_platform.d")))))))
(native-inputs
(list pkg-config))
+ (propagated-inputs
+ (list mesa))
(inputs
(list libx11 libxext xorgproto))
+ (native-search-paths (list
+ (search-path-specification
+ (variable "GBM_BACKENDS_PATH")
+ (files '("lib")))
+ (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))
+ (search-path-specification
+ (variable "__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS")
+ (files '("share/egl/egl_external_platform.d")))
+ (search-path-specification
+ (variable "__EGL_VENDOR_LIBRARY_DIRS")
+ (files '("share/glvnd/egl_vendor.d")))))
(synopsis "Vendor-neutral OpenGL dispatch library")
(description
"libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL
@@ -926,6 +962,59 @@ (define-public libglvnd
license:x11
license:expat))))
+;; only mesa will use this, keep things small and simple
+(define libglvnd-headers
+ (package
+ (inherit libglvnd)
+ (arguments (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (delete 'check)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (include (string-append out "/include"))
+ (pkgconfig (string-append out "/lib/pkgconfig")))
+ (copy-recursively "include" include)
+ ;; clean up junk
+ (delete-file (string-append include "/Makefile.am"))
+ (delete-file (string-append include "/meson.build"))
+ (mkdir-p pkgconfig)
+ ;; generate the only .pc file needed to build mesa
+ (call-with-output-file (string-append pkgconfig "/libglvnd.pc")
+ (lambda (port)
+ (format port "prefix=~a
+includedir=${prefix}/include
+
+datarootdir=${prefix}/share
+datadir=${prefix}/share
+
+Name: libglvnd
+Description: Vendor-neutral OpenGL dispatch library vendor interface
+Version: ~a
+Cflags: -I${includedir}" out #$(package-version this-package))))))))))
+ (native-inputs '())
+ (propagated-inputs '())
+ (inputs '())))
+
+(define-public libgl
+ (package/inherit libglvnd ;; can't be a literal empty shell or nothing will build
+ (name "libgl")
+ (version "glvnd")
+ (inputs '())
+ (native-inputs '())
+ (propagated-inputs (list libglvnd))
+ (build-system trivial-build-system)
+ (arguments
+ (list #:modules '((guix build union))
+ #:builder #~(begin (use-modules (guix build union))
+ (union-build #$output '#$(list libglvnd)))))
+ (synopsis "LibGL package")
+ (description
+ "LibGL package")))
+
(define-public libopenglrecorder
(package
(name "libopenglrecorder")
@@ -986,7 +1075,7 @@ (define-public soil
(native-inputs
(list unzip))
(inputs
- (list mesa))
+ (list libgl))
(home-page "https://www.lonesock.net/soil.html")
(synopsis "OpenGL texture loading library")
(description
@@ -1052,7 +1141,7 @@ (define-public glfw
(native-inputs (list doxygen unzip))
(inputs (list libxkbcommon wayland vulkan-loader))
(propagated-inputs
- (list mesa ;included in public headers
+ (list libgl ;included in public headers
;; These are in 'Requires.private' of 'glfw3.pc'.
libx11
libxrandr
@@ -1107,7 +1196,7 @@ (define-public nanovg-for-extempore
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; no tests included
(inputs
- (list mesa))
+ (list libgl))
;; Extempore refuses to build on architectures other than x86_64
(supported-systems '("x86_64-linux"))
(home-page "https://github.com/extemporelang/nanovg")
@@ -1132,7 +1221,7 @@ (define-public gl2ps
(base32 "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"))))
(build-system cmake-build-system)
(inputs
- (list libpng mesa zlib))
+ (list libpng libgl zlib))
(arguments
`(#:tests? #f)) ; no tests
(home-page "https://www.geuz.org/gl2ps/")
@@ -1168,7 +1257,7 @@ (define-public virtualgl
(assoc-ref %outputs "out") "/lib")
"-DVGL_USESSL=1"))) ; use OpenSSL
(build-system cmake-build-system)
- (inputs (list glu libjpeg-turbo libxtst mesa openssl))
+ (inputs (list glu libjpeg-turbo libxtst libgl openssl))
(native-inputs (list pkg-config))
(home-page "https://www.virtualgl.org")
(synopsis "Redirects 3D commands from an OpenGL application onto a 3D
@@ -1283,11 +1372,11 @@ (define-public glmark2
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let ((mesa (assoc-ref inputs "mesa")))
+ (let ((libgl (assoc-ref inputs "libgl")))
(substitute* (find-files "src" "gl-state-.*\\.cpp$")
- (("libGL.so") (string-append mesa "/lib/libGL.so"))
- (("libEGL.so") (string-append mesa "/lib/libEGL.so"))
- (("libGLESv2.so") (string-append mesa "/lib/libGLESv2.so")))
+ (("libGL.so") (string-append libgl "/lib/libGL.so"))
+ (("libEGL.so") (string-append libgl "/lib/libEGL.so"))
+ (("libGLESv2.so") (string-append libgl "/lib/libGLESv2.so")))
#t))))))
(native-inputs
(list pkg-config))
@@ -1298,7 +1387,7 @@ (define-public glmark2
libpng
libx11
libxcb
- mesa
+ libgl
wayland
wayland-protocols))
(home-page "https://github.com/glmark2/glmark2")
@@ -1329,7 +1418,7 @@ (define-public waffle
(delete-file-recursively f)))
(scandir ".")))))))
(build-system meson-build-system)
- (propagated-inputs (list mesa wayland))
+ (propagated-inputs (list libgl wayland))
(native-inputs (list cmocka pkg-config))
(home-page "https://waffle.freedesktop.org/")
(synopsis "Choose OpenGL API at runtime")
--
2.46.0
^ permalink raw reply related [flat|nested] 75+ messages in thread