From: Kaelyn Takata via Guix-patches via <guix-patches@gnu.org>
To: 58566@debbugs.gnu.org
Cc: Kaelyn Takata <kaelyn.alexi@protonmail.com>
Subject: [bug#58566] [PATCH core-updates v2 1/1] gnu: mesa: Update to 22.2.1.
Date: Wed, 19 Oct 2022 15:32:19 +0000 [thread overview]
Message-ID: <20221019153158.26970-2-kaelyn.alexi@protonmail.com> (raw)
In-Reply-To: <20221016165127.23333-1-kaelyn.alexi@protonmail.com>
* gnu/packages/gl.scm (mesa): Update to 22.2.1.
[phases]{fix-instrfromstring-test}: New phase. Fix the instrfromstring
test which fails on i686 using the upstream change.
[phases]{set-layer-path-in-manifests}: New phase. Insert the full
store path to libVkLayer_MESA_overlay.so into the manifest
VkLayer_MESA_overlay.json so that the vulkan layer can be used without
special workarounds.
---
gnu/packages/gl.scm | 37 ++++++++++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 7810d1d8ae..b89510c476 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -267,7 +268,7 @@ (define libva-without-mesa
(define-public mesa
(package
(name "mesa")
- (version "22.1.7")
+ (version "22.2.1")
(source
(origin
(method url-fetch)
@@ -279,7 +280,7 @@ (define-public mesa
version "/mesa-" version ".tar.xz")))
(sha256
(base32
- "12ax6lmshc8aqzw5ca7ab7f7z64n9nyzci4r1s6y1l0iryr8x0ys"))))
+ "0g5ij57ljh3l04qf7qpildl45g5g7s8ycngc19z5xx1k1anbwy80"))))
(build-system meson-build-system)
(propagated-inputs
;; The following are in the Requires.private field of gl.pc.
@@ -426,6 +427,15 @@ (define-public mesa
(("'lp_test_arit', ") ""))))
(_
'((display "No tests to disable on this architecture.\n"))))))
+ ,@(if (string=? (%current-system) "i686-linux")
+ '((add-after 'disable-failing-test 'fix-instrfromstring-test
+ (lambda _
+ ;; The instrfromstring test fails on i686, which has been already
+ ;; fixed upstream but not in 22.2.1.
+ ;; TODO: remove on update
+ (substitute* "src/gallium/drivers/r600/sfn/sfn_instr_export.cpp"
+ (("buf\\[6\\]") "buf[6] = {0}")))))
+ '())
(add-before 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -488,7 +498,28 @@ (define-public mesa
file)
(symlink reference file)))
others))))
- (delete-duplicates inodes))))))))
+ (delete-duplicates inodes)))))
+ (add-after 'install 'set-layer-path-in-manifests
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (implicit-path (string-append
+ out
+ "/share/vulkan/implicit_layer.d/"))
+ (explicit-path (string-append
+ out
+ "/share/vulkan/explicit_layer.d/"))
+ (fix-layer-path
+ (lambda (layer-name)
+ (let* ((explicit (string-append explicit-path layer-name ".json"))
+ (implicit (string-append implicit-path layer-name ".json"))
+ (manifest (if (file-exists? explicit)
+ explicit
+ implicit)))
+ (substitute* manifest
+ (((string-append "\"lib" layer-name ".so\""))
+ (string-append "\"" out "/lib/lib" layer-name ".so\"")))))))
+ (for-each fix-layer-path '("VkLayer_MESA_device_select"
+ "VkLayer_MESA_overlay"))))))))
(home-page "https://mesa3d.org/")
(synopsis "OpenGL and Vulkan implementations")
(description "Mesa is a free implementation of the OpenGL and Vulkan
--
2.37.3
next prev parent reply other threads:[~2022-10-19 15:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-16 16:51 [bug#58566] [PATCH core-updates] gnu: mesa: Update to 22.2.1 Kaelyn Takata via Guix-patches via
2022-10-19 15:32 ` [bug#58566] [PATCH core-updates v2 0/1] " Kaelyn Takata via Guix-patches via
2022-10-19 15:32 ` Kaelyn Takata via Guix-patches via [this message]
2022-11-21 19:16 ` [bug#58566] Mesa missing patches for Vulkan shared libraries Kaelyn via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221019153158.26970-2-kaelyn.alexi@protonmail.com \
--to=guix-patches@gnu.org \
--cc=58566@debbugs.gnu.org \
--cc=kaelyn.alexi@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.