From: Simon South <simon@simonsouth.net>
To: 61120@debbugs.gnu.org
Subject: [bug#61120] [PATCH core-updates 1/1] gnu: mesa: Fix sporadic test failures.
Date: Sat, 28 Jan 2023 08:32:31 -0500 [thread overview]
Message-ID: <74cb66802a5a503d087378df6e2a8d423c6e69a4.1674910858.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1674910858.git.simon@simonsouth.net>
* 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 <gert.wollny@collabora.com>
+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 <gert.wollny@collabora.com>
+ Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18130>
+
+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
next prev parent reply other threads:[~2023-01-28 13:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-28 13:30 [bug#61120] [PATCH core-updates 0/1] gnu: mesa: Fix sporadic test failures Simon South
2023-01-28 13:32 ` Simon South [this message]
2023-03-04 16:32 ` bug#61120: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=74cb66802a5a503d087378df6e2a8d423c6e69a4.1674910858.git.simon@simonsouth.net \
--to=simon@simonsouth.net \
--cc=61120@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).