From: "Danny O'Brien" <[email-masked]>
Date: Sat, 13 Nov 2021 20:09:04 +4000

>From e5d6ff6c4a4285c0fffe288617c3a11d31013f48 Mon Sep 17 00:00:00 2001
From: Danny O'Brien <[email-masked]>
Date: Sat, 13 Nov 2021 19:28:58 -0800
Subject: [PATCH staging] gnu: mesa: Update to 20.3.5.

* gnu/packages/gl.scm (mesa): Update to 20.3.5.
---
 gnu/packages/gl.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index a417e363bb..8ac40d41a1 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -235,7 +235,7 @@ (define libva-without-mesa
 (define-public mesa
   (package
     (name "mesa")
-    (version "20.2.4")
+    (version "20.3.5")
     (source
       (origin
         (method url-fetch)
@@ -247,9 +247,7 @@ (define-public mesa
                                   version "/mesa-" version ".tar.xz")))
         (sha256
          (base32
-          "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5"))
-        (patches
-         (search-patches "mesa-skip-tests.patch"))))
+          "1klifqyr54q8ar8sncykgqllil98q1ma4i6g9j2c18yzcggp56lh"))))
     (build-system meson-build-system)
     (propagated-inputs
       `(;; The following are in the Requires.private field of gl.pc.
@@ -296,14 +294,16 @@ (define-public mesa
        '(,@(match (%current-system)
              ((or "armhf-linux" "aarch64-linux")
               ;; TODO: Fix svga driver for non-Intel architectures.
-              '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
+              (list (string-append "-Dgallium-drivers=etnaviv,freedreno,kmsro,"
+                                   "lima,nouveau,panfrost,r300,r600,swrast,"
+                                   "tegra,v3d,vc4,virgl")))
              ("powerpc64le-linux"
               '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl"))
              (_
               '("-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"
-- 
2.33.1