diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
| commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
| tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/packages/gl.scm | |
| parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
| parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
| download | guix-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz | |
Merge branch 'version-1.4.0'
With resolved conflicts in: gnu/packages/gnome.scm gnu/packages/openstack.scm gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6dd90eaf93..fa49679870 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> -;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com> @@ -227,7 +227,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "21.2.5") + (version "21.3.2") (source (origin (method url-fetch) @@ -239,7 +239,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1fxcdf4qs4vmyjcns7jv62w4jy3gr383ar5b7mr77nb0nxgmhjcf")) + "1g96y59bw10ml8h4jl259g41jdmf5ww3jbwqpz1sprq7hgxvmrz2")) (patches (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) @@ -352,6 +352,12 @@ also known as DXTn or DXTC) for Mesa.") (modify-phases %standard-phases (add-after 'unpack 'disable-failing-test (lambda _ + ;; Disable the intel vulkan (anv_state_pool) tests, as they may + ;; fail in a nondeterministic fashion (see: + ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/5446). + (substitute* "src/intel/vulkan/meson.build" + (("if with_tests") + "if false")) ,@(match (%current-system) ("powerpc64le-linux" ;; Disable some of the llvmpipe tests. |