diff mbox series

[bug#61120,core-updates,1/1] gnu: mesa: Fix sporadic test failures.

Message ID 74cb66802a5a503d087378df6e2a8d423c6e69a4.1674910858.git.simon@simonsouth.net
State New
Headers show
Series gnu: mesa: Fix sporadic test failures. | expand

Commit Message

Simon South Jan. 28, 2023, 1:32 p.m. UTC 
* 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

Comments

Ludovic Courtès March 4, 2023, 4:32 p.m. UTC | #1 
Simon South <simon@simonsouth.net> skribis:

> * 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.

Applied, thanks for the investigation!

Ludo’.
diff mbox series

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)