From patchwork Sat Feb 20 22:50:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milkey Mouse X-Patchwork-Id: 27172 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AE1C627BC48; Sun, 21 Feb 2021 01:35:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3AE5127BC48 for ; Sun, 21 Feb 2021 01:35:07 +0000 (GMT) Received: from localhost ([::1]:58568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDdeM-0005nq-EI for patchwork@mira.cbaines.net; Sat, 20 Feb 2021 20:35:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDdWY-000599-Qz for guix-patches@gnu.org; Sat, 20 Feb 2021 20:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDdWY-0002Fa-Jf for guix-patches@gnu.org; Sat, 20 Feb 2021 20:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDdWY-00044B-FX for guix-patches@gnu.org; Sat, 20 Feb 2021 20:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46672] [PATCH] gnu: mesa: Update to 20.3.4. Resent-From: Milkey Mouse Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 01:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46672@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161387080815602 (code B ref -1); Sun, 21 Feb 2021 01:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Feb 2021 01:26:48 +0000 Received: from localhost ([127.0.0.1]:53270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDdWI-00043X-RT for submit@debbugs.gnu.org; Sat, 20 Feb 2021 20:26:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:50674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDb5X-0000FF-O0 for submit@debbugs.gnu.org; Sat, 20 Feb 2021 17:51:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDb5X-0004oF-Fk for guix-patches@gnu.org; Sat, 20 Feb 2021 17:50:59 -0500 Received: from sender4-of-o54.zoho.com ([136.143.188.54]:21497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDb5V-0007Jl-M3 for guix-patches@gnu.org; Sat, 20 Feb 2021 17:50:59 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1613861450; cv=none; d=zohomail.com; s=zohoarc; b=GHSWmGRTS2yWbiNHe84a9Kfq/Nl1PucxR3eDnJStrtaEj6dN9in5dNQ9e8MNApaUDMydzrhFtn1g3fugr5zjWHQOgWku0sSUNAnxQMKVJO+AmVK3Eu1AWOFzsJ1kXW0NRuzfsXXxC7ik5rotiWFbE5aEt/m/MjOEOO13wVCChz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613861450; h=Content-Type:Content-Transfer-Encoding:Date:From:MIME-Version:Message-ID:Subject:To; bh=9nWcxo3TN9cZtsWwaSK7IA1yH2lzC66SNz9kTMvF/gI=; b=IQfArt01KaU1yNXemaFie3Kbcy/wQseucvcOmRw52zWaiV2skH53CJHnyzsQxWZnmBW+bKkHT55+HeCOqOyAFZ8/xAhSOxWlVzuh2oyRwgO+Oth1lC/hWzblwCjePOcQCYzMwkmWvvgBWD1Gn3EjXfb4EMcUa+4+1MlYqz+gBwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=meme.institute; spf=pass smtp.mailfrom=milkeymouse@meme.institute; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1613861450; s=memelord; d=meme.institute; i=milkeymouse@meme.institute; h=From:To:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=9nWcxo3TN9cZtsWwaSK7IA1yH2lzC66SNz9kTMvF/gI=; b=egn1DUhWLZ6hT1a1nUHyUkaNXHjr6+EHIHIC4/itfYWgyKs+9JJa1CCLZ72h6trt PuSTjfpKVGxJW3a9lUlXoq50j61gQmp6L0PWCAhwEYqfEym+ixIW93q4qsYv7PENItM Ga/2wFBHmB1rfGWGhPN/jcRtQG5o6AVDn+c/ZERU= Received: from jupiter.local (50.47.115.222 [50.47.115.222]) by mx.zohomail.com with SMTPS id 1613861445988834.5431726198342; Sat, 20 Feb 2021 14:50:45 -0800 (PST) From: Milkey Mouse Message-ID: <20210220225047.682956-1-milkeymouse@meme.institute> Date: Sat, 20 Feb 2021 14:50:47 -0800 X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.54; envelope-from=milkeymouse@meme.institute; helo=sender4-of-o54.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 20 Feb 2021 20:26:45 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 20 Feb 2021 20:35:00 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/X: Adjust. * gnu/packages/gl.scm (mesa): Update to 20.3.4. [arguments]<#:configure-flags>: Remove deprecated platforms. --- gnu/packages/gl.scm | 6 +++--- gnu/packages/patches/mesa-skip-tests.patch | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e378474147..7eb47db4fc 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -235,7 +235,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "20.2.4") + (version "20.3.4") (source (origin (method url-fetch) @@ -247,7 +247,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "14m09bk7akj0k02lg8fhvvzbdsashlbdsgl2cw7wbqfj2mhdqwh5")) + "1120kf280hg4h0a2505vxf6rdw8r2ydl3cg4iwkmpx0zxj3sj8fw")) (patches (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) @@ -301,7 +301,7 @@ also known as DXTn or DXTC) for Mesa.") '("-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" diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch index 2622d5d312..9c0c531189 100644 --- a/gnu/packages/patches/mesa-skip-tests.patch +++ b/gnu/packages/patches/mesa-skip-tests.patch @@ -5,7 +5,7 @@ for now. --- a/src/compiler/glsl/tests/cache_test.c +++ b/src/compiler/glsl/tests/cache_test.c -@@ -170,11 +170,6 @@ +@@ -212,11 +212,6 @@ test_disk_cache_create(void) unsetenv("MESA_GLSL_CACHE_DIR"); unsetenv("XDG_CACHE_HOME"); @@ -14,9 +14,9 @@ for now. - - disk_cache_destroy(cache); - - /* Test with XDG_CACHE_HOME set */ - setenv("XDG_CACHE_HOME", CACHE_TEST_TMP "/xdg-cache-home", 1); - cache = disk_cache_create("test", "make_check", 0); + #ifdef ANDROID + /* Android doesn't try writing to disk (just calls the cache callbacks), so + * the directory tests below don't apply. This test fails on i686-linux. I couldn't come up with a regex that could be used to disable it just on i686-linux, so we disable it @@ -28,7 +28,7 @@ diff --git a/src/util/meson.build b/src/util/meson.build index 0893f64..909b3e0 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -289,18 +289,6 @@ if with_tests +@@ -320,18 +320,6 @@ if with_tests suite : ['util'], )