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

From: Rutger Helling <[email-masked]>
Date: Tue, 12 Jun 2018 21:08:16 +0200

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.
From 0e5c728e8fd5974da8f0cf1fc5b6885715bf562d Mon Sep 17 00:00:00 2001
From: Rutger Helling <[email-masked]>
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