bug#26465: [PATCH] gnu: mesa: Update to 17.0.3.

bug#26465: [PATCH] gnu: mesa: Update to 17.0.3.

[Marius Bakke]

There is a test failure in this version. As far as I can tell, this is
because it fails to locate or write to the users home directory.
Setting $HOME to /tmp does not work since it looks it up directly
through '<pwd.h>'. I'd like a second opinion before disabling this test.


* gnu/packages/gl.scm (mesa): Update to 17.0.3.
[source]: Adapt URI to new directory structure.
[arguments]: Add 'set-HOME' phase. Remove stray whitespaces.
[home-page]: Use HTTPS.
---
 gnu/packages/gl.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 37a1bd909..ba2e22f64 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -199,15 +199,17 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "13.0.5")
+    (version "17.0.3")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
-                            version "/mesa-" version ".tar.xz"))
+        (uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  "mesa-" version ".tar.xz")
+                   (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
+                                  version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz"))
+          "1vg7kzkaanawlr2zjbki05f1bpnf651qlg0jz47dc0m0fm86yr6a"))
         (patches
          (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
     (build-system gnu-build-system)
@@ -263,7 +265,7 @@ also known as DXTn or DXTC) for Mesa.")
          ;; Without floating point texture support, drivers such as Nouveau
          ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
          "--enable-texture-float"
-         
+
          ;; Also enable the tests.
          "--enable-gallium-tests"
 
@@ -307,8 +309,14 @@ also known as DXTn or DXTC) for Mesa.")
                  ;; it's never installed since Mesa removed its
                  ;; egl_gallium support.
                  (("\"gbm_dri\\.so")
-                  (string-append "\"" out "/lib/dri/gbm_dri.so")))))))))
-    (home-page "http://mesa3d.org/")
+                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
+               #t)))
+         (add-before 'check 'set-HOME
+           (lambda _
+             ;; One test tries to create $HOME/.cache.
+             (setenv "HOME" "/tmp")
+             #t)))))
+    (home-page "https://mesa3d.org/")
     (synopsis "OpenGL implementation")
     (description "Mesa is a free implementation of the OpenGL specification -
 a system for rendering interactive 3D graphics.  A variety of device drivers
-- 
2.12.2

bug#26465: [PATCH] gnu: mesa: Update to 17.0.3.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 3154 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> There is a test failure in this version. As far as I can tell, this is
> because it fails to locate or write to the users home directory.
> Setting $HOME to /tmp does not work since it looks it up directly
> through '<pwd.h>'. I'd like a second opinion before disabling this test.
>

In src/compiler/test-suite.log I found that the test tried and failed to
create "/.cache". Is this the failure you're talking about?

>
> * gnu/packages/gl.scm (mesa): Update to 17.0.3.
> [source]: Adapt URI to new directory structure.
> [arguments]: Add 'set-HOME' phase. Remove stray whitespaces.
> [home-page]: Use HTTPS.
> ---
>  gnu/packages/gl.scm | 22 +++++++++++++++-------
>  1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
> index 37a1bd909..ba2e22f64 100644
> --- a/gnu/packages/gl.scm
> +++ b/gnu/packages/gl.scm
> @@ -199,15 +199,17 @@ also known as DXTn or DXTC) for Mesa.")
>  (define-public mesa
>    (package
>      (name "mesa")
> -    (version "13.0.5")
> +    (version "17.0.3")
>      (source
>        (origin
>          (method url-fetch)
> -        (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
> -                            version "/mesa-" version ".tar.xz"))
> +        (uri (list (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
> +                                  "mesa-" version ".tar.xz")
> +                   (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
> +                                  version "/mesa-" version ".tar.xz")))
>          (sha256
>           (base32
> -          "11zgynii1wz17131ml1mmblpwib8m88zz2jwi5h5llh1r3iagkmz"))
> +          "1vg7kzkaanawlr2zjbki05f1bpnf651qlg0jz47dc0m0fm86yr6a"))
>          (patches
>           (search-patches "mesa-wayland-egl-symbols-check-mips.patch"))))
>      (build-system gnu-build-system)
> @@ -263,7 +265,7 @@ also known as DXTn or DXTC) for Mesa.")
>           ;; Without floating point texture support, drivers such as Nouveau
>           ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
>           "--enable-texture-float"
> -         
> +
>           ;; Also enable the tests.
>           "--enable-gallium-tests"
>  
> @@ -307,8 +309,14 @@ also known as DXTn or DXTC) for Mesa.")
>                   ;; it's never installed since Mesa removed its
>                   ;; egl_gallium support.
>                   (("\"gbm_dri\\.so")
> -                  (string-append "\"" out "/lib/dri/gbm_dri.so")))))))))
> -    (home-page "http://mesa3d.org/")
> +                  (string-append "\"" out "/lib/dri/gbm_dri.so")))
> +               #t)))
> +         (add-before 'check 'set-HOME
> +           (lambda _
> +             ;; One test tries to create $HOME/.cache.
> +             (setenv "HOME" "/tmp")
> +             #t)))))
> +    (home-page "https://mesa3d.org/")
>      (synopsis "OpenGL implementation")
>      (description "Mesa is a free implementation of the OpenGL specification -
>  a system for rendering interactive 3D graphics.  A variety of device drivers

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26465: [PATCH] gnu: mesa: Update to 17.0.3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 695 bytes --]

Kei Kebreau <kei@openmailbox.org> writes:

> Marius Bakke <mbakke@fastmail.com> writes:
>
>> There is a test failure in this version. As far as I can tell, this is
>> because it fails to locate or write to the users home directory.
>> Setting $HOME to /tmp does not work since it looks it up directly
>> through '<pwd.h>'. I'd like a second opinion before disabling this test.
>>
>
> In src/compiler/test-suite.log I found that the test tried and failed to
> create "/.cache". Is this the failure you're talking about?

Yes. I'll see if I can make it consult $HOME, or just hardcode the
location to /tmp; otherwise it's probably safe to disable it. The test
succeeds when invoked interactively.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26465: [PATCH] gnu: mesa: Update to 17.0.3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 968 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Marius Bakke <mbakke@fastmail.com> writes:
>>
>>> There is a test failure in this version. As far as I can tell, this is
>>> because it fails to locate or write to the users home directory.
>>> Setting $HOME to /tmp does not work since it looks it up directly
>>> through '<pwd.h>'. I'd like a second opinion before disabling this test.
>>>
>>
>> In src/compiler/test-suite.log I found that the test tried and failed to
>> create "/.cache". Is this the failure you're talking about?
>
> Yes. I'll see if I can make it consult $HOME, or just hardcode the
> location to /tmp; otherwise it's probably safe to disable it. The test
> succeeds when invoked interactively.

I ended up patching out the one test case that fails, in commit
0315b20a2c5d68d6b6d53ecd0f80964c5ca91d70.

@Leo, others: I don't anticipate more staging updates in a while, should
we try and get this merged?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]