[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/21: gnu: mesa: Hardcode libvulkan.so's dependency for zink.
From: |
guix-commits |
Subject: |
05/21: gnu: mesa: Hardcode libvulkan.so's dependency for zink. |
Date: |
Mon, 1 Apr 2024 01:35:37 -0400 (EDT) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 304d3d96440df25edc26419367777138e91ec5ec
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Fri Feb 2 16:53:44 2024 +0100
gnu: mesa: Hardcode libvulkan.so's dependency for zink.
* gnu/packages/gl.scm (mesa): Add vulkan-loader as an input. Refer to its
libvulkan.so.1 by full path in the zink gallium driver.
(cherry picked from commit e2875b7bb894f3575b6e61daa9c1f5d5f4c14b84)
Change-Id: I83ff787e6148a45b9403e578dd744f7eb85a221b
---
gnu/packages/gl.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f8dc8c1d9d..df1e0796cb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -327,6 +327,7 @@ also known as DXTn or DXTC) for Mesa.")
libxrandr
libxvmc
llvm-for-mesa
+ vulkan-loader
wayland
wayland-protocols
`(,zstd "lib")))
@@ -479,7 +480,7 @@ svga,swrast,virgl,zink")))
(_
'((display "No tests to disable on this
architecture.\n"))))))
(add-before 'configure 'fix-dlopen-libnames
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(let ((out #$output))
;; Remain agnostic to .so.X.Y.Z versions while doing
;; the substitutions so we're future-safe.
@@ -495,7 +496,12 @@ svga,swrast,virgl,zink")))
;; it's never installed since Mesa removed its
;; egl_gallium support.
(("\"gbm_dri\\.so")
- (string-append "\"" out "/lib/dri/gbm_dri.so"))))))
+ (string-append "\"" out "/lib/dri/gbm_dri.so")))
+ (substitute* "src/gallium/drivers/zink/zink_screen.c"
+ (("util_dl_open\\(VK_LIBNAME\\)")
+ (format #f "util_dl_open(\"~a\")"
+ (search-input-file inputs
+ "lib/libvulkan.so.1")))))))
(add-after 'install 'split-outputs
(lambda _
(let ((out #$output)
- 02/21: gnu: python-pycairo: Update to 1.26.0., (continued)
- 02/21: gnu: python-pycairo: Update to 1.26.0., guix-commits, 2024/04/01
- 03/21: gnu: cairo: Update to 1.18.0., guix-commits, 2024/04/01
- 04/21: gnu: libdrm: Update to 2.4.120., guix-commits, 2024/04/01
- 06/21: gnu: mesa: Update to 24.0.3., guix-commits, 2024/04/01
- 09/21: gnu: spirv-headers: Update to 1.3.280.0., guix-commits, 2024/04/01
- 12/21: gnu: spirv-cross: Update to 1.3.280.0., guix-commits, 2024/04/01
- 13/21: gnu: shaderc: Update to 2024.0., guix-commits, 2024/04/01
- 15/21: gnu: vulkan-loader: Update to 1.3.280.0., guix-commits, 2024/04/01
- 16/21: gnu: volk: Update to 1.3.280.0., guix-commits, 2024/04/01
- 19/21: gnu: Add vulkan-utility-libraries., guix-commits, 2024/04/01
- 05/21: gnu: mesa: Hardcode libvulkan.so's dependency for zink.,
guix-commits <=
- 07/21: gnu: sdl2: Update to 2.30.1., guix-commits, 2024/04/01
- 08/21: gnu: librsvg-2.40: Skip tests that fail with cairo 1.18.0., guix-commits, 2024/04/01
- 10/21: gnu: spirv-tools: Update to 1.3.280.0., guix-commits, 2024/04/01
- 11/21: gnu: glslang: Update to 1.3.280.0., guix-commits, 2024/04/01
- 14/21: gnu: vulkan-headers: Update to 1.3.280.0., guix-commits, 2024/04/01
- 17/21: gnu: vulkan-tools: Update to 1.3.280.0., guix-commits, 2024/04/01
- 18/21: gnu: magic-enum: Update to 0.9.5., guix-commits, 2024/04/01
- 20/21: gnu: vulkan-validationlayers: Update to 1.3.280.0., guix-commits, 2024/04/01
- 21/21: gnu: mesa: Update to 24.0.4., guix-commits, 2024/04/01