* [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
@ 2021-08-23 5:50 John Kehayias via Guix-patches via
2021-08-23 5:58 ` John Kehayias via Guix-patches via
2021-10-15 0:42 ` Maxim Cournoyer
0 siblings, 2 replies; 6+ messages in thread
From: John Kehayias via Guix-patches via @ 2021-08-23 5:50 UTC (permalink / raw)
To: 50170
* gnu/packages/gl.scm (mesa): Update to 21.2.1.
* gnu/packages/patches/mesa-skip-tests.patch: Modify for current version.
---
gnu/packages/gl.scm | 4 ++--
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 7a8a478953..d6e754779d 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -239,7 +239,7 @@ also known as DXTn or DXTC) for Mesa.")
(define-public mesa
(package
(name "mesa")
- (version "21.1.6")
+ (version "21.2.1")
(source
(origin
(method url-fetch)
@@ -251,7 +251,7 @@ also known as DXTn or DXTC) for Mesa.")
version "/mesa-" version ".tar.xz")))
(sha256
(base32
- "0dwyk7cxlwna24ap23i8i92a2qcc6xhp16i03zzakpqiz4i03jxi"))
+ "11qpq16xbxymcgiy0wk787dk4yw2pv8fzgj8d92ng6s11dqycr9c"))
(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..0813fa2a8a 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 aa5bfef5dbc..3ec845b05fa 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(
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
2021-08-23 5:50 [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1 John Kehayias via Guix-patches via
@ 2021-08-23 5:58 ` John Kehayias via Guix-patches via
2021-10-15 0:42 ` Maxim Cournoyer
1 sibling, 0 replies; 6+ messages in thread
From: John Kehayias via Guix-patches via @ 2021-08-23 5:58 UTC (permalink / raw)
To: 50170@debbugs.gnu.org
Hi everyone,
I know we're working on getting core-updates-frozen in shape to merge, but with a few more Mesa updates out recently I thought maybe I can sneak this in as an addendum to the current Mesa patches. I checked it builds on x86-64 and modified the patch which removes the troublesome (i686) test to still apply here. No other changes to the build process I could see. 21.2.0 was out earlier but was a development release; this is the first regular release for 21.2.
If I may, I would suggest seeing if this builds on the CI for other architectures without major changes, and if so would recommend this update. Mesa has been moving quickly with bug fixes and enhancing their graphics drivers, so with the extended time between core-update merges would be great to be up to date for this current merge.
And if not, this can be the start of the next core-updates Mesa update (maybe Mesa can be moved to a quicker updating process?). There is also a further bug fix release for 21.1, so we could bump to 21.1.7 from our current 21.1.6 in core-updates-frozen.
Let me know what you think and anything else we need on this front.
John
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
2021-08-23 5:50 [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1 John Kehayias via Guix-patches via
2021-08-23 5:58 ` John Kehayias via Guix-patches via
@ 2021-10-15 0:42 ` Maxim Cournoyer
2021-10-15 2:15 ` John Kehayias via Guix-patches via
1 sibling, 1 reply; 6+ messages in thread
From: Maxim Cournoyer @ 2021-10-15 0:42 UTC (permalink / raw)
To: John Kehayias; +Cc: 50170
Hi!
John Kehayias <john.kehayias@protonmail.com> writes:
> * gnu/packages/gl.scm (mesa): Update to 21.2.1.
> * gnu/packages/patches/mesa-skip-tests.patch: Modify for current version.
> ---
> gnu/packages/gl.scm | 4 ++--
> 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 7a8a478953..d6e754779d 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -239,7 +239,7 @@ also known as DXTn or DXTC) for Mesa.")
> (define-public mesa
> (package
> (name "mesa")
> - (version "21.1.6")
> + (version "21.2.1")
> (source
> (origin
> (method url-fetch)
> @@ -251,7 +251,7 @@ also known as DXTn or DXTC) for Mesa.")
> version "/mesa-" version ".tar.xz")))
> (sha256
> (base32
> - "0dwyk7cxlwna24ap23i8i92a2qcc6xhp16i03zzakpqiz4i03jxi"))
> + "11qpq16xbxymcgiy0wk787dk4yw2pv8fzgj8d92ng6s11dqycr9c"))
> (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..0813fa2a8a 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 aa5bfef5dbc..3ec845b05fa 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(
> --
> 2.33.0
I wanted to apply this to my batched local core-updates-frozen branch,
but I get:
error: corrupt patch at line 69
Could you please resend it?
Thanks!
Maxim
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
2021-10-15 0:42 ` Maxim Cournoyer
@ 2021-10-15 2:15 ` John Kehayias via Guix-patches via
2021-10-15 2:27 ` Maxim Cournoyer
0 siblings, 1 reply; 6+ messages in thread
From: John Kehayias via Guix-patches via @ 2021-10-15 2:15 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 50170
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
Hi Maxim!
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Thursday, October 14th, 2021 at 8:42 PM, Maxim Cournoyer wrote:
> Hi!
>
> I wanted to apply this to my batched local core-updates-frozen branch,
> but I get:
>
> error: corrupt patch at line 69
>
> Could you please resend it?
>
Looks like the patch for disabling a test (that fails on i686) needed an update. I've updated the version to 21.2.4 which literally just came out (wow Mesa is fast these days with bugfix versions) and adjusted the patch. I've tested that it applies and builds on x86_64 and with --system=i686-linux successfully.
Let me know if you run into any problem with this version!
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-gl.scm-mesa-Update-to-21.2.4.patch --]
[-- Type: text/x-patch; name=0001-gnu-packages-gl.scm-mesa-Update-to-21.2.4.patch, Size: 2542 bytes --]
From a1115434c5f67f2b4c2bfe69c0344416c45971d4 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Thu, 14 Oct 2021 22:12:41 -0400
Subject: [PATCH] * gnu/packages/gl.scm (mesa): Update to 21.2.4.
* gnu/packages/patches/mesa-skip-tests.patch: Adjust for current version.
---
gnu/packages/gl.scm | 4 ++--
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(
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
2021-10-15 2:15 ` John Kehayias via Guix-patches via
@ 2021-10-15 2:27 ` Maxim Cournoyer
2021-11-12 6:02 ` bug#50170: " Maxim Cournoyer
0 siblings, 1 reply; 6+ messages in thread
From: Maxim Cournoyer @ 2021-10-15 2:27 UTC (permalink / raw)
To: John Kehayias; +Cc: 50170
Hello!
John Kehayias <john.kehayias@protonmail.com> writes:
> Hi Maxim!
>
> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>
> On Thursday, October 14th, 2021 at 8:42 PM, Maxim Cournoyer wrote:
>
>> Hi!
>>
>> I wanted to apply this to my batched local core-updates-frozen branch,
>> but I get:
>>
>> error: corrupt patch at line 69
>>
>> Could you please resend it?
>>
>
> Looks like the patch for disabling a test (that fails on i686) needed
> an update. I've updated the version to 21.2.4 which literally just
> came out (wow Mesa is fast these days with bugfix versions) and
> adjusted the patch. I've tested that it applies and builds on x86_64
> and with --system=i686-linux successfully.
>
> Let me know if you run into any problem with this version!
>
> John
Successfully applied; thanks for the prompt reply!
Maxim
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#50170: [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
2021-10-15 2:27 ` Maxim Cournoyer
@ 2021-11-12 6:02 ` Maxim Cournoyer
0 siblings, 0 replies; 6+ messages in thread
From: Maxim Cournoyer @ 2021-11-12 6:02 UTC (permalink / raw)
To: John Kehayias; +Cc: 50170-done
Hi,
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> Hello!
>
> John Kehayias <john.kehayias@protonmail.com> writes:
>
>> Hi Maxim!
>>
>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>>
>> On Thursday, October 14th, 2021 at 8:42 PM, Maxim Cournoyer wrote:
>>
>>> Hi!
>>>
>>> I wanted to apply this to my batched local core-updates-frozen branch,
>>> but I get:
>>>
>>> error: corrupt patch at line 69
>>>
>>> Could you please resend it?
>>>
>>
>> Looks like the patch for disabling a test (that fails on i686) needed
>> an update. I've updated the version to 21.2.4 which literally just
>> came out (wow Mesa is fast these days with bugfix versions) and
>> adjusted the patch. I've tested that it applies and builds on x86_64
>> and with --system=i686-linux successfully.
>>
>> Let me know if you run into any problem with this version!
>>
>> John
We now have 21.2.4 in core-updates-frozen since commit
3b9b685d051c44206d1b5efce920c85037ec081c.
Thank you!
Closing,
Maxim
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-12 6:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-23 5:50 [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1 John Kehayias via Guix-patches via
2021-08-23 5:58 ` John Kehayias via Guix-patches via
2021-10-15 0:42 ` Maxim Cournoyer
2021-10-15 2:15 ` John Kehayias via Guix-patches via
2021-10-15 2:27 ` Maxim Cournoyer
2021-11-12 6:02 ` bug#50170: " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).