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