[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 361 bytes --]

Hey Guix,

here's a patch to update Mesa on staging to the just released 18.1.1.
Since there's a little more involved than usual I'm sending it in for
review first.

The 18.1 series needs to be built with LLVM >= 4 (the current
18.2-devel series needs to be built with LLVM >=5). As such I've
changed Mesa to use LLVM 6.0.

Feedback/testing welcome!

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-mesa-Update-to-18.1.1.patch --]
[-- Type: text/x-patch, Size: 2058 bytes --]

From b71ac0de7ef3b4df146f01899263ed1f245a9db7 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Sat, 2 Jun 2018 19:49:11 +0200
Subject: [PATCH] gnu: mesa: Update to 18.1.1.

* gnu/packages/gl.scm (mesa): Update to 18.1.1.
[inputs]: Change llvm-3.9.1 to llvm.
[arguments]: Remove substitution for removed file.
---
 gnu/packages/gl.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 323d279ea..b55917480 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "18.0.4")
+    (version "18.1.1")
     (source
       (origin
         (method url-fetch)
@@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "03wjlb5qy1mn8d6zm0q1pq35x60agrfxyh9bmq6w59ghrvkwyfqz"))
+          "10bp1m1avf4ab329f09k71w3c0d4wfw0icknfjj19b2svqp2lcfk"))
         (patches
          (search-patches "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
@@ -259,7 +259,7 @@ also known as DXTn or DXTC) for Mesa.")
         ("libxvmc" ,libxvmc)
         ,@(match (%current-system)
             ((or "x86_64-linux" "i686-linux")
-             `(("llvm" ,llvm-3.9.1))) ; exactly 3.9.0 or 3.9.1 for swrast
+             `(("llvm" ,llvm)))
             (_
              `()))
         ("makedepend" ,makedepend)
@@ -328,8 +328,6 @@ also known as DXTn or DXTC) for Mesa.")
          (add-after
            'unpack 'patch-create_test_cases
            (lambda _
-             (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
-               (("/usr/bin/env bash") (which "bash")))
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
-- 
2.17.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

bug#31689: [PATCH staging] gnu: mesa: Update to 18.1.1.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 236 bytes --]

I'm withdrawing this patch for now. I keep getting segfaults with Mesa
18.1.1.

For now I've updated Mesa in staging to 18.0.5 instead, which
is the last release of the 18.0 series. It's also the last version to
support LLVM < 4.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-mesa-Update-to-18.1.1.patch --]
[-- Type: text/x-patch, Size: 2058 bytes --]

From b71ac0de7ef3b4df146f01899263ed1f245a9db7 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Sat, 2 Jun 2018 19:49:11 +0200
Subject: [PATCH] gnu: mesa: Update to 18.1.1.

* gnu/packages/gl.scm (mesa): Update to 18.1.1.
[inputs]: Change llvm-3.9.1 to llvm.
[arguments]: Remove substitution for removed file.
---
 gnu/packages/gl.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 323d279ea..b55917480 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -222,7 +222,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "18.0.4")
+    (version "18.1.1")
     (source
       (origin
         (method url-fetch)
@@ -234,7 +234,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "03wjlb5qy1mn8d6zm0q1pq35x60agrfxyh9bmq6w59ghrvkwyfqz"))
+          "10bp1m1avf4ab329f09k71w3c0d4wfw0icknfjj19b2svqp2lcfk"))
         (patches
          (search-patches "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
@@ -259,7 +259,7 @@ also known as DXTn or DXTC) for Mesa.")
         ("libxvmc" ,libxvmc)
         ,@(match (%current-system)
             ((or "x86_64-linux" "i686-linux")
-             `(("llvm" ,llvm-3.9.1))) ; exactly 3.9.0 or 3.9.1 for swrast
+             `(("llvm" ,llvm)))
             (_
              `()))
         ("makedepend" ,makedepend)
@@ -328,8 +328,6 @@ also known as DXTn or DXTC) for Mesa.")
          (add-after
            'unpack 'patch-create_test_cases
            (lambda _
-             (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
-               (("/usr/bin/env bash") (which "bash")))
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
-- 
2.17.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Marius Bakke]

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

Rutger Helling <rhelling@mykolab.com> writes:

> I'm withdrawing this patch for now. I keep getting segfaults with Mesa
> 18.1.1.

Under which circumstances did you get a segfault?

I'm currently running IceCat using this Mesa and will reconfigure my
system to test it further, but so far so good here.

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

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Rutger Helling]

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

I think it has something to do with shader compilation. It kept
segfaulting for me when I tried to start a program that seemed to use
OpenGL. This included me being unable to start SDDM/GNOME (all I got
was a black screen).

Oddly enough, programs that use Vulkan instead seemed fine.

I figured out after closing this patch that if I use another
experimental way of compiling shaders, by setting the environment
variable "R600_DEBUG=nir" it no longer crashes for me.

If it works for you after reconfiguring your entire system you can push
it to staging if you want. I'll just set the environment variable
globally then since I don't wanna hold up this Mesa upgrade.

On a side note, GNOME on Wayland's menus were broken for me starting
with Mesa 18.0+, where the menus wouldn't respond at all. Don't know if
that's still the case. If it is GNOME will probably have to be
upgraded at some point.

On Tue, 12 Jun 2018 01:47:08 +0200
Marius Bakke <mbakke@fastmail.com> wrote:

> Rutger Helling <rhelling@mykolab.com> writes:
> 
> > I'm withdrawing this patch for now. I keep getting segfaults with
> > Mesa 18.1.1.  
> 
> Under which circumstances did you get a segfault?
> 
> I'm currently running IceCat using this Mesa and will reconfigure my
> system to test it further, but so far so good here.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Rutger Helling]

[-- Attachment #1.1: Type: text/plain, Size: 325 bytes --]

So it turned out that me mixing Mesa versions (I also used a git
version of Mesa for myself) confused Mesa. I solved it by deleting
~/.cache/mesa_shader_cache. 

I doubt that this will be a problem for anyone else, so here's a
new rebased patch that updates Mesa to 18.1.1. With your blessing I'll
push it to staging.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: staging-0001-gnu-mesa-Update-to-18.1.1.patch --]
[-- Type: text/x-patch, Size: 2059 bytes --]

From 0e5c728e8fd5974da8f0cf1fc5b6885715bf562d Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 12 Jun 2018 16:03:29 +0200
Subject: [PATCH] gnu: mesa: Update to 18.1.1.

* gnu/packages/gl.scm (mesa): Update to 18.1.1.
[inputs]: Change llvm-3.9.1 to llvm.
[arguments]: Remove substitution for removed file.
---
 gnu/packages/gl.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 1630f46be..30dd9a18f 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -224,7 +224,7 @@ also known as DXTn or DXTC) for Mesa.")
 (define-public mesa
   (package
     (name "mesa")
-    (version "18.0.5")
+    (version "18.1.1")
     (source
       (origin
         (method url-fetch)
@@ -236,7 +236,7 @@ also known as DXTn or DXTC) for Mesa.")
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "0szwqjr5x2q4r6gcwb862s18wl4s0z34w4rd0vr7isiasylbp1si"))
+          "10bp1m1avf4ab329f09k71w3c0d4wfw0icknfjj19b2svqp2lcfk"))
         (patches
          (search-patches "mesa-skip-disk-cache-test.patch"))))
     (build-system gnu-build-system)
@@ -259,7 +259,7 @@ also known as DXTn or DXTC) for Mesa.")
         ("libxvmc" ,libxvmc)
         ,@(match (%current-system)
             ((or "x86_64-linux" "i686-linux")
-             `(("llvm" ,llvm-3.9.1))) ; exactly 3.9.0 or 3.9.1 for swrast
+             `(("llvm" ,llvm)))
             (_
              `()))
         ("makedepend" ,makedepend)
@@ -327,8 +327,6 @@ also known as DXTn or DXTC) for Mesa.")
          (add-after
            'unpack 'patch-create_test_cases
            (lambda _
-             (substitute* "src/compiler/glsl/tests/lower_jumps/create_test_cases.py"
-               (("/usr/bin/env bash") (which "bash")))
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
-- 
2.17.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Marius Bakke]

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

Rutger Helling <rhelling@mykolab.com> writes:

> So it turned out that me mixing Mesa versions (I also used a git
> version of Mesa for myself) confused Mesa. I solved it by deleting
> ~/.cache/mesa_shader_cache. 

Oh, good to know!

> I doubt that this will be a problem for anyone else, so here's a
> new rebased patch that updates Mesa to 18.1.1. With your blessing I'll
> push it to staging.

I trust your instincts here ;-) LGTM!

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

[bug#31689] [PATCH staging] gnu: mesa: Update to 18.1.1.

[Rutger Helling]

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

Pushed, thanks! :-)

On Wed, 13 Jun 2018 02:01:31 +0200
Marius Bakke <mbakke@fastmail.com> wrote:

> Rutger Helling <rhelling@mykolab.com> writes:
> 
> > So it turned out that me mixing Mesa versions (I also used a git
> > version of Mesa for myself) confused Mesa. I solved it by deleting
> > ~/.cache/mesa_shader_cache.   
> 
> Oh, good to know!
> 
> > I doubt that this will be a problem for anyone else, so here's a
> > new rebased patch that updates Mesa to 18.1.1. With your blessing
> > I'll push it to staging.  
> 
> I trust your instincts here ;-) LGTM!


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]