guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

160/203: gnu: mesa: Replace obsolete vulkan-overlay-layer build option.


From: guix-commits
Subject: 160/203: gnu: mesa: Replace obsolete vulkan-overlay-layer build option.
Date: Wed, 3 Nov 2021 21:10:30 -0400 (EDT)

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 8efab1d8dcdb8630c5bdfa088361bbcd93703b5e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Oct 27 22:01:32 2021 -0400

    gnu: mesa: Replace obsolete vulkan-overlay-layer build option.
    
    The option has been replaced by `vulkan-layers', an array of options.
    
    * gnu/packages/gl.scm (mesa): Remove trailing #t.
    [configure-flags]: Replace the vulkan-overlay-layer build option by
    vulkan-layers.
---
 gnu/packages/gl.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index ccb7867..7756acb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -332,7 +332,7 @@ also known as DXTn or DXTC) for Mesa.")
          ;; Enable the Vulkan overlay layer on architectures using llvm.
          ,@(match (%current-system)
              ((or "x86_64-linux" "i686-linux" "powerpc64le-linux" 
"aarch64-linux" "powerpc-linux")
-              '("-Dvulkan-overlay-layer=true"))
+              '("-Dvulkan-layers=device-select,overlay"))
              (_
               '()))
 
@@ -400,8 +400,7 @@ also known as DXTn or DXTC) for Mesa.")
            (lambda _
              ;; See <https://gitlab.freedesktop.org/mesa/mesa/-/issues/3181>.
              (substitute* 
"src/compiler/glsl/glcpp/tests/084-unbalanced-parentheses.c.expected"
-              (("unexpected \\$end") "unexpected end of file"))
-             #t))
+              (("unexpected \\$end") "unexpected end of file"))))
          (add-before 'configure 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -419,8 +418,7 @@ also known as DXTn or DXTC) for Mesa.")
                  ;; it's never installed since Mesa removed its
                  ;; egl_gallium support.
                  (("\"gbm_dri\\.so")
-                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
-               #t)))
+                  (string-append "\"" out "/lib/dri/gbm_dri.so"))))))
          (add-after 'install 'split-outputs
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
@@ -465,8 +463,7 @@ also known as DXTn or DXTC) for Mesa.")
                                                        file)
                                               (symlink reference file)))
                                         others))))
-                         (delete-duplicates inodes))
-               #t))))))
+                         (delete-duplicates inodes))))))))
     (home-page "https://mesa3d.org/";)
     (synopsis "OpenGL and Vulkan implementations")
     (description "Mesa is a free implementation of the OpenGL and Vulkan



reply via email to

[Prev in Thread] Current Thread [Next in Thread]