GNU bug report logs - #50170
[PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.

Previous Next

Package: guix-patches;

Reported by: John Kehayias <john.kehayias <at> protonmail.com>

Date: Mon, 23 Aug 2021 05:51:01 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 50170 in the body.
You can then email your comments to 50170 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#50170; Package guix-patches. (Mon, 23 Aug 2021 05:51:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to John Kehayias <john.kehayias <at> protonmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 23 Aug 2021 05:51:01 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Guix-patches <guix-patches <at> gnu.org>
Subject: [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
Date: Mon, 23 Aug 2021 05:50:25 +0000
* 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






Information forwarded to guix-patches <at> gnu.org:
bug#50170; Package guix-patches. (Mon, 23 Aug 2021 05:59:01 GMT) Full text and rfc822 format available.

Message #8 received at 50170 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: "50170 <at> debbugs.gnu.org" <50170 <at> debbugs.gnu.org>
Subject: [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1.
Date: Mon, 23 Aug 2021 05:58:43 +0000
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




Information forwarded to guix-patches <at> gnu.org:
bug#50170; Package guix-patches. (Fri, 15 Oct 2021 00:44:01 GMT) Full text and rfc822 format available.

Message #11 received at 50170 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 50170 <at> debbugs.gnu.org
Subject: Re: bug#50170: [PATCH core-updates-frozen] gnu: mesa: Update to
 21.2.1.
Date: Thu, 14 Oct 2021 20:42:34 -0400
Hi!

John Kehayias <john.kehayias <at> 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




Information forwarded to guix-patches <at> gnu.org:
bug#50170; Package guix-patches. (Fri, 15 Oct 2021 02:16:02 GMT) Full text and rfc822 format available.

Message #14 received at 50170 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 50170 <at> debbugs.gnu.org
Subject: Re: bug#50170: [PATCH core-updates-frozen] gnu: mesa: Update to
 21.2.1.
Date: Fri, 15 Oct 2021 02:15:39 +0000
[Message part 1 (text/plain, inline)]
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
[0001-gnu-packages-gl.scm-mesa-Update-to-21.2.4.patch (text/x-patch, attachment)]

Information forwarded to guix-patches <at> gnu.org:
bug#50170; Package guix-patches. (Fri, 15 Oct 2021 02:28:02 GMT) Full text and rfc822 format available.

Message #17 received at 50170 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 50170 <at> debbugs.gnu.org
Subject: Re: bug#50170: [PATCH core-updates-frozen] gnu: mesa: Update to
 21.2.1.
Date: Thu, 14 Oct 2021 22:27:22 -0400
Hello!

John Kehayias <john.kehayias <at> 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




Reply sent to Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility. (Fri, 12 Nov 2021 06:03:01 GMT) Full text and rfc822 format available.

Notification sent to John Kehayias <john.kehayias <at> protonmail.com>:
bug acknowledged by developer. (Fri, 12 Nov 2021 06:03:01 GMT) Full text and rfc822 format available.

Message #22 received at 50170-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: 50170-done <at> debbugs.gnu.org
Subject: Re: bug#50170: [PATCH core-updates-frozen] gnu: mesa: Update to
 21.2.1.
Date: Fri, 12 Nov 2021 01:02:44 -0500
Hi,

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> Hello!
>
> John Kehayias <john.kehayias <at> 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




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 10 Dec 2021 12:24:11 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 99 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.