From patchwork Fri Oct 15 02:15:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 33855 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 E930927BBE3; Fri, 15 Oct 2021 03:16:20 +0100 (BST) 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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 7749427BBE1 for ; Fri, 15 Oct 2021 03:16:20 +0100 (BST) Received: from localhost ([::1]:54736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mbCld-0007R9-Na for patchwork@mira.cbaines.net; Thu, 14 Oct 2021 22:16:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mbClO-0007Qv-QD for guix-patches@gnu.org; Thu, 14 Oct 2021 22:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mbClO-0007Zg-I0 for guix-patches@gnu.org; Thu, 14 Oct 2021 22:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mbClO-0006TN-A9 for guix-patches@gnu.org; Thu, 14 Oct 2021 22:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50170] [PATCH core-updates-frozen] gnu: mesa: Update to 21.2.1. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Oct 2021 02:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50170 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 50170@debbugs.gnu.org Received: via spool by 50170-submit@debbugs.gnu.org id=B50170.163426415424865 (code B ref 50170); Fri, 15 Oct 2021 02:16:02 +0000 Received: (at 50170) by debbugs.gnu.org; 15 Oct 2021 02:15:54 +0000 Received: from localhost ([127.0.0.1]:37484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbClG-0006Sz-DR for submit@debbugs.gnu.org; Thu, 14 Oct 2021 22:15:54 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:17089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mbClB-0006Sk-Gz for 50170@debbugs.gnu.org; Thu, 14 Oct 2021 22:15:52 -0400 Date: Fri, 15 Oct 2021 02:15:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1634264142; bh=CTaESkFjME7SUx86cyOa1zDzC4FlUy3MPgEb7pLlmdA=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=QymqqGjooB5YGw2h+jr1UkLWjxQqtnQY4O/8GdqCpuQe0SdisTV/H/oECwZVNiA/W qeFX8wXO0q7MBh6QWW2ghOvh57tOji3/BiqUAFzmZZI8FgF/x6naKAsn6QFc/l+H0F 7uBvsTN/8sM/FHOL+MYS0zMW5vviUwArc4rHYqe0= Message-ID: In-Reply-To: <87tuhjnmo5.fsf@gmail.com> References: <87tuhjnmo5.fsf@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hi Maxim! ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Thursday, October 14th, 2021 at 8:42 PM, Maxim Cournoyer wrote: > Hi! > > I wanted to apply this to my batched local core-updates-frozen branch, > but I get: > > error: corrupt patch at line 69 > > Could you please resend it? > Looks like the patch for disabling a test (that fails on i686) needed an update. I've updated the version to 21.2.4 which literally just came out (wow Mesa is fast these days with bugfix versions) and adjusted the patch. I've tested that it applies and builds on x86_64 and with --system=i686-linux successfully. Let me know if you run into any problem with this version! John From a1115434c5f67f2b4c2bfe69c0344416c45971d4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 14 Oct 2021 22:12:41 -0400 Subject: [PATCH] * gnu/packages/gl.scm (mesa): Update to 21.2.4. * gnu/packages/patches/mesa-skip-tests.patch: Adjust for current version. --- gnu/packages/gl.scm | 4 ++-- gnu/packages/patches/mesa-skip-tests.patch | 28 +++++++--------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 52b7508d6b..ccb78675f4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -238,7 +238,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "21.1.6") + (version "21.2.4") (source (origin (method url-fetch) @@ -250,7 +250,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "0dwyk7cxlwna24ap23i8i92a2qcc6xhp16i03zzakpqiz4i03jxi")) + "0i2vz3ppcgqm076546imzl11jr3rlch1iv62lffk60mcs61dwvpy")) (patches (search-patches "mesa-skip-tests.patch")))) (build-system meson-build-system) diff --git a/gnu/packages/patches/mesa-skip-tests.patch b/gnu/packages/patches/mesa-skip-tests.patch index 8f587ea7ef..7ff571dcf5 100644 --- a/gnu/packages/patches/mesa-skip-tests.patch +++ b/gnu/packages/patches/mesa-skip-tests.patch @@ -5,25 +5,15 @@ completely with this patch: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4091 diff --git a/src/util/meson.build b/src/util/meson.build -index 0893f64..909b3e0 100644 +index 319b22d9bf7..93790c72675 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -289,18 +289,6 @@ if with_tests - suite : ['util'], - ) +@@ -344,7 +344,7 @@ if with_tests + ) + endif -- test( -- 'u_debug_stack', -- executable( -- 'u_debug_stack_test', -- files('u_debug_stack_test.cpp'), -- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], -- dependencies : [idep_mesautil, idep_gtest], -- c_args : [c_msvc_compat_args], -- ), -- suite : ['util'], -- ) -- - process_test_exe = executable( - 'process_test', - files('process_test.c'), +- foreach t: ['bitset', 'register_allocate', 'u_debug_stack', 'u_qsort'] ++ foreach t: ['bitset', 'register_allocate', 'u_qsort'] + test( + t, + executable( -- 2.33.0