[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: mesa: Ungraft.
From: |
guix-commits |
Subject: |
02/06: gnu: mesa: Ungraft. |
Date: |
Tue, 25 Jul 2023 17:15:19 -0400 (EDT) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 5555f3f98e97f8bbcd6ce9bc6b76a6eb20566f55
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Tue Jul 25 16:18:30 2023 -0400
gnu: mesa: Ungraft.
* gnu/packages/gl.scm (mesa)[configure-flags]: Add intel_hasvk and swrast to
vulkan-drivers.
[replacement]: Remove.
(mesa-vulkan-hasvk): Remove variable.
---
gnu/packages/gl.scm | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d42903cc8f..9325d41907 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -279,7 +279,6 @@ also known as DXTn or DXTC) for Mesa.")
(base32
"1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq"))))
(build-system meson-build-system)
- (replacement mesa-vulkan-hasvk)
(propagated-inputs
;; The following are in the Requires.private field of gl.pc.
(list libdrm
@@ -346,7 +345,7 @@ svga,swrast,virgl")))
;; Explicitly enable Vulkan on some architectures.
#$@(match (%current-system)
((or "i686-linux" "x86_64-linux")
- '("-Dvulkan-drivers=intel,amd"))
+ '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast"))
((or "powerpc64le-linux" "powerpc-linux")
'("-Dvulkan-drivers=amd,swrast"))
("aarch64-linux"
@@ -528,21 +527,6 @@ device drivers allows Mesa to be used in many different
environments ranging
from software emulation to complete hardware acceleration for modern GPUs.")
(license license:x11)))
-(define mesa-vulkan-hasvk
- (let ((graft mesa)
- (vulk "-Dvulkan-drivers=intel,amd"))
- (package
- (inherit graft)
- (arguments
- (substitute-keyword-arguments (package-arguments graft)
- ((#:configure-flags flags)
- #~(begin
- (use-modules (ice-9 match))
- (map (match-lambda
- (#$vulk (string-append #$vulk ",intel_hasvk,swrast"))
- (x x))
- #$flags))))))))
-
(define-public mesa-opencl
(package/inherit mesa
(name "mesa-opencl")
- branch mesa-updates created (now 8c6e90d7dc), guix-commits, 2023/07/25
- 02/06: gnu: mesa: Ungraft.,
guix-commits <=
- 03/06: gnu: mesa: Enable zstd compression for shader cache., guix-commits, 2023/07/25
- 06/06: gnu: mesa: Update to 23.1.4., guix-commits, 2023/07/25
- 05/06: gnu: wayland-protocols: Update to 1.32., guix-commits, 2023/07/25
- 01/06: gnu: mesa: Fix VDPAU drivers path., guix-commits, 2023/07/25
- 04/06: gnu: libva: Update to 2.19.0., guix-commits, 2023/07/25