GNU bug report logs - #46672
[PATCH] gnu: mesa: Update to 20.3.4.

Previous Next

Package: guix-patches;

Reported by: Milkey Mouse <milkeymouse <at> meme.institute>

Date: Sun, 21 Feb 2021 01:27:02 UTC

Severity: normal

Tags: patch

Done: Brice Waegeneire <brice <at> waegenei.re>

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 46672 in the body.
You can then email your comments to 46672 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#46672; Package guix-patches. (Sun, 21 Feb 2021 01:27:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Milkey Mouse <milkeymouse <at> meme.institute>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 21 Feb 2021 01:27:02 GMT) Full text and rfc822 format available.

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

From: Milkey Mouse <milkeymouse <at> meme.institute>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: mesa: Update to 20.3.4.
Date: Sat, 20 Feb 2021 14:50:47 -0800
* gnu/packages/patches/X: Adjust.
* gnu/packages/gl.scm (mesa): Update to 20.3.4.
[arguments]<#:configure-flags>: Remove deprecated platforms.
---
 gnu/packages/gl.scm                        |  6 +++---
 gnu/packages/patches/mesa-skip-tests.patch | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index e378474147..7eb47db4fc 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "20.2.4")
+    (version "20.3.4")
     (source
       (origin
         (method url-fetch)
@@ -247,7 +247,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"))
+          "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"))
         (patches
          (search-patches "mesa-skip-tests.patch"))))
     (build-system meson-build-system)
@@ -301,7 +301,7 @@ also known as DXTn or DXTC) for Mesa.")
               '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
          ;; Enable various optional features.  TODO: opencl requires libclc,
          ;; omx requires libomxil-bellagio
-         "-Dplatforms=x11,drm,surfaceless,wayland"
+         "-Dplatforms=x11,wayland"
          "-Dglx=dri"        ;Thread Local Storage, improves performance
          ;; "-Dopencl=true"
          ;; "-Domx=true"
diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch
index 2622d5d312..9c0c531189 100644
--- a/gnu/packages/patches/mesa-skip-tests.patch
+++ b/gnu/packages/patches/mesa-skip-tests.patch
@@ -5,7 +5,7 @@ for now.
 
 --- a/src/compiler/glsl/tests/cache_test.c
 +++ b/src/compiler/glsl/tests/cache_test.c
-@@ -170,11 +170,6 @@
+@@ -212,11 +212,6 @@ test_disk_cache_create(void)
     unsetenv("MESA_GLSL_CACHE_DIR");
     unsetenv("XDG_CACHE_HOME");
  
@@ -14,9 +14,9 @@ for now.
 -
 -   disk_cache_destroy(cache);
 -
-    /* Test with XDG_CACHE_HOME set */
-    setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1);
-    cache = disk_cache_create("test", "make_check", 0);
+ #ifdef ANDROID
+    /* Android doesn't try writing to disk (just calls the cache callbacks), so
+     * the directory tests below don't apply.
 
 This test fails on i686-linux. I couldn't come up with a regex that
 could be used to disable it just on i686-linux, so we disable it
@@ -28,7 +28,7 @@ diff --git a/src/util/meson.build b/src/util/meson.build
 index 0893f64..909b3e0 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -289,18 +289,6 @@ if with_tests
+@@ -320,18 +320,6 @@ if with_tests
       suite : ['util'],
    )   
  
-- 
2.30.1






Information forwarded to guix-patches <at> gnu.org:
bug#46672; Package guix-patches. (Thu, 25 Feb 2021 17:11:02 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 46672 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: Add usync.
Date: Thu, 25 Feb 2021 18:10:30 +0100
[Message part 1 (text/plain, inline)]
Hello!

Somehow after applying your patch and running "$ ./pre-inst-env guix
lint usync" the following error appears, probably syntax error
somewhere, can't figure it out though, can you take a look?

I ran something like this to apply the patch on current GNU Guix master
(a2ece4da1fdccb9e94681e38a3f3a79b0d43e061):

$ curl https://issues.guix.gnu.org/issue/46572/raw/0 | git am

Backtrace:
In ice-9/boot-9.scm:
  1736:10 19 (with-exception-handler _ _ #:unwind? _ # _)
In guix/store.scm:
   636:37 18 (thunk)
   1305:8 17 (call-with-build-handler #<procedure 7f72e83a5360 at i…>
…)
In guix/scripts/build.scm:
    499:2 16 (_)
In srfi/srfi-1.scm:
   673:15 15 (append-map _ _ . _)
   586:17 14 (map1 ((argument . "usync") (build-mode . 0) (# . #t) …))
In guix/scripts/build.scm:
   519:30 13 (_ _)
In gnu/packages.scm:
    477:2 12 (%find-package "usync" "usync" #f)
    362:6 11 (find-best-packages-by-name _ _)
   292:55 10 (_ "usync" _)
In unknown file:
           9 (force #<promise #<procedure 7f72e82e9fc0 at gnu/packag…>)
In gnu/packages.scm:
   239:33  8 (fold-packages #<procedure 7f72e414cf18 at gnu/package…>
…)
In guix/discovery.scm:
   153:11  7 (all-modules _ #:warn _)
In srfi/srfi-1.scm:
   460:18  6 (fold #<procedure 7f72e83aa760 at guix/discovery.scm:1…>
…)
In guix/discovery.scm:
   143:19  5 (_ _ ())
In srfi/srfi-1.scm:
   691:23  4 (filter-map #<procedure 7f72e83aa740 at guix/discove…> .
#)
In guix/discovery.scm:
   118:22  3 (_ . _)
In ice-9/eval.scm:
    619:8  2 (_ #(#(#<directory (guix ui) 7f72e9e08500> (# "re…" …))))
In ice-9/boot-9.scm:
  1669:16  1 (raise-exception _ #:continuable? _)
  1669:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1669:16: In procedure raise-exception:
Throw to key `match-error' with args `("match" "no matching pattern"
(unbound-variable "resolve-interface" "no binding `~A' in module ~A"
(python (gnu packages python)) #f))'.

Thank you!
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#46672; Package guix-patches. (Fri, 26 Feb 2021 13:31:01 GMT) Full text and rfc822 format available.

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

From: Léo Le Bouter <lle-bout <at> zaclys.net>
To: 46672 <at> debbugs.gnu.org
Subject: [PATCH] gnu: mesa: Update to 20.3.4.
Date: Fri, 26 Feb 2021 14:30:38 +0100
[Message part 1 (text/plain, inline)]
Sorry, ignore the previous email that was sent for here by mistake due
to typing out (wrong) bug number manually.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#46672; Package guix-patches. (Thu, 08 Apr 2021 21:27:02 GMT) Full text and rfc822 format available.

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

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 46672 <at> debbugs.gnu.org
Subject: mesa 20.3.4
Date: Thu, 8 Apr 2021 23:26:32 +0200
This still builds OK on master, and following
this, I'll send 20.3.5 update that also builds
OK on current master.

But guix refresh -l tells me it's for core-updates.

Which is a kind of freeze now I think...

I'll revisit later then

-- 
Vincent Legoll




Information forwarded to guix-patches <at> gnu.org:
bug#46672; Package guix-patches. (Thu, 08 Apr 2021 21:27:02 GMT) Full text and rfc822 format available.

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

From: Vincent Legoll <vincent.legoll <at> gmail.com>
To: 46672 <at> debbugs.gnu.org
Cc: Vincent Legoll <vincent.legoll <at> gmail.com>
Subject: [PATCH] gnu: mesa: Update to 20.3.5.
Date: Thu,  8 Apr 2021 23:26:38 +0200
* gnu/packages/gl.scm (mesa): Update to 20.3.5.
---
 gnu/packages/gl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 437d270f05..b86f879465 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "20.3.4")
+    (version "20.3.5")
     (source
       (origin
         (method url-fetch)
@@ -247,7 +247,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw"))
+          "1klifqyr54q8ar8sncykgqllil98q1ma4i6g9j2c18yzcggp56lh"))
         (patches
          (search-patches "mesa-skip-tests.patch"))))
     (build-system meson-build-system)
-- 
2.31.0





Reply sent to Brice Waegeneire <brice <at> waegenei.re>:
You have taken responsibility. (Sat, 04 Sep 2021 13:41:02 GMT) Full text and rfc822 format available.

Notification sent to Milkey Mouse <milkeymouse <at> meme.institute>:
bug acknowledged by developer. (Sat, 04 Sep 2021 13:41:02 GMT) Full text and rfc822 format available.

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

From: Brice Waegeneire <brice <at> waegenei.re>
To: Vincent Legoll <vincent.legoll <at> gmail.com>
Cc: 46672-close <at> debbugs.gnu.org, milkeymouse <at> meme.institute
Subject: Re: bug#46672: [PATCH] gnu: mesa: Update to 20.3.4.
Date: Sat, 04 Sep 2021 15:39:42 +0200
Hello Vincent and Milkey,

Vincent Legoll <vincent.legoll <at> gmail.com> writes:

> * gnu/packages/gl.scm (mesa): Update to 20.3.5.

Thank for updating mesa!  Unfortunatly this patch as been supserseeded by the
commit 2c0013916e87acc90562dea167a6ff3e1dfee58e (curently on
corer-update-frozen) which update mesa to 21.1.6.  So I'm closing this issue.

Cheers,
- Brice




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

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

Previous Next


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