From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id sEBLDyUk1WPdQAEAbAwnHQ (envelope-from ) for ; Sat, 28 Jan 2023 14:33:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kLZUDyUk1WNeBAAA9RJhRA (envelope-from ) for ; Sat, 28 Jan 2023 14:33:25 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0220E3DF08 for ; Sat, 28 Jan 2023 14:33:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLlKK-000417-25; Sat, 28 Jan 2023 08:33:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pLlKI-0003zK-NN for guix-patches@gnu.org; Sat, 28 Jan 2023 08:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pLlKH-0002Pg-S7 for guix-patches@gnu.org; Sat, 28 Jan 2023 08:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLlKH-0007PS-OP for guix-patches@gnu.org; Sat, 28 Jan 2023 08:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61120] [PATCH core-updates 1/1] gnu: mesa: Fix sporadic test failures. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Jan 2023 13:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61120@debbugs.gnu.org Received: via spool by 61120-submit@debbugs.gnu.org id=B61120.167491276228456 (code B ref 61120); Sat, 28 Jan 2023 13:33:01 +0000 Received: (at 61120) by debbugs.gnu.org; 28 Jan 2023 13:32:42 +0000 Received: from localhost ([127.0.0.1]:39895 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLlJx-0007Ou-Jg for submit@debbugs.gnu.org; Sat, 28 Jan 2023 08:32:41 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:51604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLlJv-0007Oe-0D for 61120@debbugs.gnu.org; Sat, 28 Jan 2023 08:32:39 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6A444E82E4 for <61120@debbugs.gnu.org>; Sat, 28 Jan 2023 13:32:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rohPm1zH1odz for <61120@debbugs.gnu.org>; Sat, 28 Jan 2023 13:32:33 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0C12AE80C9 for <61120@debbugs.gnu.org>; Sat, 28 Jan 2023 13:32:33 +0000 (UTC) From: Simon South Date: Sat, 28 Jan 2023 08:32:31 -0500 Message-Id: <74cb66802a5a503d087378df6e2a8d423c6e69a4.1674910858.git.simon@simonsouth.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674912805; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=6EnNvBI7kM9CWK0IEpWuqRF44m1uTNnNyQ1gvWjF+Ak=; b=tlNNVD7DzCIdxAjjVCgb221Kim3sLRZq15gZk950iGGNCAkIeskpxdKPKXe49qc573QYjd o8SbioAvE7QXBNghAOsdW43zoAguOMLTZ2WIRyM0/+qU1mWs9DMXl3b7kIocamuhlHAD1C vm8v7HAEWCdSyClL0Wr5qbqtLhylXyLDUS/EXO8YBQKh1MFzyi7dzPRadmNMGFDBnJ8OoH xqpy2OUN9jvDpd9D4OUOk9B17mYg/IwnV9EL2Tvkp0zfEiOtFNsyuSs070gmDj919r4++y TJ4+6JLLZUi1triwwEMS4rM2+v9TUQsKC3eiZu9liagUujE1vtpX/xKz5GlS0w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674912805; a=rsa-sha256; cv=none; b=Pr2MFSsN44WQO74HgMSpUbOQ1zQX9sRcgsMokl36A3bmgQiO/EyvAYAICgahoYtRFzVoKO N2Vlopu9ZzRQE9W6NtiEhf4bGJcsvh83Dz0tEIJXd9tNwQv4AXnY8QNLdkJNPoMyl/g7Q4 VMEU532MEb4xhtxQ8ruEYjBsT6utBJeR2F8Gy/d2VY+VJpHXwt+OSaekDtXf5JtkRoAP5V 1XD2htucOLWMRP7xiiXFOimiznCxR8qOGbNiFT++oC1KJ3sRx25k2f5ZwPpFjM+TKaCmbG Q1E1CjfPq17TKB/sAueS5DpooHy5UJ5BVGmDjQl/0ix9qwneg0KlIEsztpHiKw== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -0.87 X-Spam-Score: -0.87 X-Migadu-Queue-Id: 0220E3DF08 X-TUID: 2D8H0pJF+KS6 * gnu/packages/patches/mesa-fix-sporadic-test-failures.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gl.scm (mesa)[source]: Apply it. --- gnu/local.mk | 1 + gnu/packages/gl.scm | 4 ++- .../mesa-fix-sporadic-test-failures.patch | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mesa-fix-sporadic-test-failures.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3dbad5b439..306c72c44d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1505,6 +1505,7 @@ dist_patch_DATA = \ %D%/packages/patches/mercurial-hg-extension-path.patch \ %D%/packages/patches/mercurial-openssl-compat.patch \ %D%/packages/patches/mesa-opencl-all-targets.patch \ + %D%/packages/patches/mesa-fix-sporadic-test-failures.patch \ %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dd62fac13e..8a6d2ac57f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -279,7 +279,9 @@ (define-public mesa version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5")))) + "1azpr68pdg63yq3igmzwsgn2ypg49m0mp3hfkq0lcyswr99npmv5")) + (patches + (list (search-patch "mesa-fix-sporadic-test-failures.patch"))))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. diff --git a/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch b/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch new file mode 100644 index 0000000000..50ac5530a2 --- /dev/null +++ b/gnu/packages/patches/mesa-fix-sporadic-test-failures.patch @@ -0,0 +1,27 @@ +commit 7749599d737d205a88bbb6fa755ba095d9b581fa +Author: Gert Wollny +Date: Mon Aug 15 17:15:43 2022 +0200 + + r600/sfn: Initialize out buffer when printing op + + 79ca456b4837b3bc21cf9ef3c03c505c4b4909f6 + r600/sfn: rewrite NIR backend + + Closes: #7021 + + Signed-off-by: Gert Wollny + Part-of: + +diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp +index 3d40ea1796a..00826ed6457 100644 +--- a/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp ++++ b/src/gallium/drivers/r600/sfn/sfn_instr_export.cpp +@@ -206,7 +206,7 @@ bool WriteScratchInstr::do_ready() const + + void WriteScratchInstr::do_print(std::ostream& os) const + { +- char buf[6]; ++ char buf[6] = {0}; + + os << "WRITE_SCRATCH "; + if (m_address) -- 2.39.1