Subject: bug#31689: closed ([PATCH staging] gnu: mesa: Update to 18.1.1.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 07 Jun 2018 11:40:03 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
31689: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31689
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: [PATCH staging] gnu: mesa: Update to 18.1.1.
From: Rutger Helling <[email-masked]>
To: [email-masked]
Date: Thu, 7 Jun 2018 13:39:44 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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

Subject: [PATCH staging] gnu: mesa: Update to 18.1.1.
From: Rutger Helling <[email-masked]>
To: [email-masked]
Date: Sat, 2 Jun 2018 19:57:15 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

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