diff mbox series

[bug#46672] gnu: mesa: Update to 20.3.4.

Message ID 20210220225047.682956-1-milkeymouse@meme.institute
State New
Headers show
Series [bug#46672] gnu: mesa: Update to 20.3.4. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Milkey Mouse Feb. 20, 2021, 10:50 p.m. UTC
* 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(-)

Comments

Léo Le Bouter Feb. 25, 2021, 5:10 p.m. UTC | #1
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!
zimoun Feb. 25, 2021, 5:35 p.m. UTC | #2
Hi Léo,

(Your email was for 46572@debbugs.gnu.org and not 46672@debbugs.gnu, right?)

Note that even "guix show" would return a backtrace.

The error you get comes from circular dependency, I guess.
If you comment both 'unison' and '#:use-module (gnu packages ocaml)',
then there is no backtrace.

To find the offending path and detect the cycle, a tool is still missing, AFAIK.


Hope that helps,
simon
Léo Le Bouter Feb. 25, 2021, 5:44 p.m. UTC | #3
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!
Léo Le Bouter Feb. 26, 2021, 1:30 p.m. UTC | #4
Sorry, ignore the previous email that was sent for here by mistake due
to typing out (wrong) bug number manually.
diff mbox series

Patch

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'],
    )