diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2021-10-14 22:12:41 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:15 -0500 |
| commit | 3b9b685d051c44206d1b5efce920c85037ec081c (patch) | |
| tree | 012aa1ffa74b0bb6397426e86b6123c37d01d92c | |
| parent | 50db3459cb20132a811b6b071545e76757ae8fa5 (diff) | |
| download | guix-3b9b685d051c44206d1b5efce920c85037ec081c.tar.gz | |
gnu: mesa: Update to 21.2.4.
* gnu/packages/patches/mesa-skip-tests.patch: Adjust for current version. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
| -rw-r--r-- | gnu/packages/gl.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/mesa-skip-tests.patch | 28 |
2 files changed, 11 insertions, 21 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 52b7508d6b..ccb78675f4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -238,7 +238,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "21.1.6") + (version "21.2.4") (source (origin (method url-fetch) @@ -250,7 +250,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0dwyk7cxlwna24ap23i8i92a2qcc6xhp16i03zzakpqiz4i03jxi")) + "0i2vz3ppcgqm076546imzl11jr3rlch1iv62lffk60mcs61dwvpy")) (patches (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch index 8f587ea7ef..7ff571dcf5 100644 --- a/gnu/packages/patches/mesa-skip-tests.patch +++ b/gnu/packages/patches/mesa-skip-tests.patch @@ -5,25 +5,15 @@ completely with this patch: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091 diff --git a/src/util/meson.build b/src/util/meson.build -index 0893f64..909b3e0 100644 +index 319b22d9bf7..93790c72675 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -289,18 +289,6 @@ if with_tests - suite : ['util'], - ) +@@ -344,7 +344,7 @@ if with_tests + ) + endif -- test( -- 'u_debug_stack', -- executable( -- 'u_debug_stack_test', -- files('u_debug_stack_test.cpp'), -- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], -- dependencies : [idep_mesautil, idep_gtest], -- c_args : [c_msvc_compat_args], -- ), -- suite : ['util'], -- ) -- - process_test_exe = executable( - 'process_test', - files('process_test.c'), +- foreach t: ['bitset', 'register_allocate', 'u_debug_stack', 'u_qsort'] ++ foreach t: ['bitset', 'register_allocate', 'u_qsort'] + test( + t, + executable( |