Package: guix-patches;
Reported by: The Man <squishypinkelephant <at> gmail.com>
Date: Mon, 25 Nov 2024 03:40:02 UTC
Severity: normal
Tags: patch
View this message in rfc822 format
From: The Man <squishypinkelephant <at> gmail.com> To: 74522 <at> debbugs.gnu.org Cc: The Man <squishypinkelephant <at> gmail.com> Subject: [bug#74522] [PATCH 70/73] move libgl provider from mesa to libglvnd+mesa Date: Sun, 24 Nov 2024 21:42:03 -0600
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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.