gnu: mesa: Update to 20.1.9.

* gnu/packages/gl.scm (mesa): Update to 20.1.9.
[arguments]<#:phases>[fix-tests]: New phase.
This commit is contained in:
Danny Milosavljevic 2020-10-07 16:11:47 +02:00
parent 0be0f249eb
commit 9e4a193b09
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5

View file

@ -234,7 +234,7 @@ (define libva-without-mesa
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
(version "20.1.8") (version "20.1.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -246,7 +246,7 @@ (define-public mesa
version "/mesa-" version ".tar.xz"))) version "/mesa-" version ".tar.xz")))
(sha256 (sha256
(base32 (base32
"1252mgwiy05nz8mm4gjkzmnjfvdz5yv1shnsr837cdnan86dvsad")) "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"))
(patches (patches
(search-patches "mesa-skip-disk-cache-test.patch")))) (search-patches "mesa-skip-disk-cache-test.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
@ -358,6 +358,12 @@ (define-public mesa
(("'u_format_test',") "")) (("'u_format_test',") ""))
#t))) #t)))
'()) '())
(add-after 'unpack 'fix-tests
(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))
(add-before 'configure 'fix-dlopen-libnames (add-before 'configure 'fix-dlopen-libnames
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))