diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index d778640..03fd140 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 15 09:14:11 UTC 2021 - Stefan Dirsch - -- update to 21.2.4 - * fourth bugfix release - * 300 fixes from the new r300 maintainer! Additionally, panfrost, - lots of crocus, some freedreno, intel, radv, core meas, gallivum, - anv, spirv, gallim, aco, i915g, lima, and llvmpipe fixes. -- supersedes U_gallivm-add-new-wrapper-around-Module.patch, - U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch - -------------------------------------------------------------------- -Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch - -- u_fix-build-on-ppc64le.patch - * fixes build on ppc64le (boo#1191569) - ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4b916bb..f34618e 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.2.4 +%define _version 21.2.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,7 +114,7 @@ %endif Name: Mesa-drivers -Version: 21.2.4 +Version: 21.2.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -133,7 +133,8 @@ Patch2: n_add-Mesa-headers-again.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch -Patch200: u_fix-build-on-ppc64le.patch +Patch101: U_gallivm-add-new-wrapper-around-Module.patch +Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -767,7 +768,8 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch58 -p1 %patch100 -p1 -%patch200 -p1 +%patch101 -p1 +%patch102 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/Mesa.changes b/Mesa.changes index d778640..03fd140 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,20 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 15 09:14:11 UTC 2021 - Stefan Dirsch - -- update to 21.2.4 - * fourth bugfix release - * 300 fixes from the new r300 maintainer! Additionally, panfrost, - lots of crocus, some freedreno, intel, radv, core meas, gallivum, - anv, spirv, gallim, aco, i915g, lima, and llvmpipe fixes. -- supersedes U_gallivm-add-new-wrapper-around-Module.patch, - U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch - -------------------------------------------------------------------- -Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch - -- u_fix-build-on-ppc64le.patch - * fixes build on ppc64le (boo#1191569) - ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 5f06918..8f4c387 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.2.4 +%define _version 21.2.3 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -113,7 +113,7 @@ %endif Name: Mesa -Version: 21.2.4 +Version: 21.2.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -132,7 +132,8 @@ Patch2: n_add-Mesa-headers-again.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch -Patch200: u_fix-build-on-ppc64le.patch +Patch101: U_gallivm-add-new-wrapper-around-Module.patch +Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -766,7 +767,8 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch58 -p1 %patch100 -p1 -%patch200 -p1 +%patch101 -p1 +%patch102 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/U_gallivm-add-new-wrapper-around-Module.patch b/U_gallivm-add-new-wrapper-around-Module.patch new file mode 100644 index 0000000..e2560e5 --- /dev/null +++ b/U_gallivm-add-new-wrapper-around-Module.patch @@ -0,0 +1,60 @@ +From c1b4c64a28d9fc093229eab91a3a7fc4cb4fe29a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= +Date: Thu, 22 Jul 2021 07:34:09 +0200 +Subject: [PATCH 1/2] gallivm: add new wrapper around + Module::setOverrideStackAlignment() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need it in the next commit to replace setting the stack alignment on +i386 with LLVM >= 13 through the TargetOption::StackAlignmentOverride, +which was removed in the upstream commit +. + +Unfortunately Module::setOverrideStackAlignment() is not available +through the C API and we need to wrap it ourselves. + +Signed-off-by: Kai Wasserbäch +Reference: mesa/mesa#4906 +Reviewed-by: Roland Scheidegger +Part-of: +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 9 +++++++++ + src/gallium/auxiliary/gallivm/lp_bld_misc.h | 3 +++ + 2 files changed, 12 insertions(+) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 44d07fe69c6..5f52ed08fae 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -615,3 +615,12 @@ lp_is_function(LLVMValueRef v) + { + return LLVMGetValueKind(v) == LLVMFunctionValueKind; + } ++ ++extern "C" void ++lp_set_module_stack_alignment_override(LLVMModuleRef MRef, unsigned align) ++{ ++#if LLVM_VERSION_MAJOR >= 13 ++ llvm::Module *M = llvm::unwrap(MRef); ++ M->setOverrideStackAlignment(align); ++#endif ++} +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.h b/src/gallium/auxiliary/gallivm/lp_bld_misc.h +index f2a15f19e47..fa0ce90162e 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.h ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.h +@@ -91,6 +91,9 @@ lp_is_function(LLVMValueRef v); + + void + lp_free_objcache(void *objcache); ++ ++void ++lp_set_module_stack_alignment_override(LLVMModuleRef M, unsigned align); + #ifdef __cplusplus + } + #endif +-- +2.33.0 + diff --git a/U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch b/U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch new file mode 100644 index 0000000..153c427 --- /dev/null +++ b/U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch @@ -0,0 +1,52 @@ +From 3a2d317b996f57647da23de7876142be4b9b71f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= +Date: Thu, 22 Jul 2021 07:42:12 +0200 +Subject: [PATCH 2/2] gallivm: fix FTBFS on i386 with LLVM >= 13, + StackAlignmentOverride is gone +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the newly added wrapper lp_set_module_stack_alignment_override() to +achieve the same end result. + +Signed-off-by: Kai Wasserbäch +Closes: mesa/mesa#4906 +Reviewed-by: Roland Scheidegger +Part-of: +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 ++++ + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index 8e5fe6f24dc..d2d049ace5e 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -347,6 +347,10 @@ init_gallivm_state(struct gallivm_state *gallivm, const char *name, + if (!gallivm->module) + goto fail; + ++#if defined(PIPE_ARCH_X86) ++ lp_set_module_stack_alignment_override(gallivm->module, 4); ++#endif ++ + gallivm->builder = LLVMCreateBuilderInContext(gallivm->context); + if (!gallivm->builder) + goto fail; +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 5f52ed08fae..be288ab02e2 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -350,7 +350,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, + * friends for configuring code generation options, like stack alignment. + */ + TargetOptions options; +-#if defined(PIPE_ARCH_X86) ++#if defined(PIPE_ARCH_X86) && LLVM_VERSION_MAJOR < 13 + options.StackAlignmentOverride = 4; + #endif + +-- +2.33.0 + diff --git a/mesa-21.2.3.tar.xz b/mesa-21.2.3.tar.xz new file mode 100644 index 0000000..978fda5 --- /dev/null +++ b/mesa-21.2.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7245284a159d2484770e1835a673e79e4322a9ddf43b17859668244946db7174 +size 15780780 diff --git a/mesa-21.2.3.tar.xz.sig b/mesa-21.2.3.tar.xz.sig new file mode 100644 index 0000000..ab21e96 Binary files /dev/null and b/mesa-21.2.3.tar.xz.sig differ diff --git a/mesa-21.2.4.tar.xz b/mesa-21.2.4.tar.xz deleted file mode 100644 index 9c0539f..0000000 --- a/mesa-21.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44 -size 15809464 diff --git a/mesa-21.2.4.tar.xz.sig b/mesa-21.2.4.tar.xz.sig deleted file mode 100644 index 71f4831..0000000 Binary files a/mesa-21.2.4.tar.xz.sig and /dev/null differ diff --git a/u_fix-build-on-ppc64le.patch b/u_fix-build-on-ppc64le.patch deleted file mode 100644 index 2e0a4b6..0000000 --- a/u_fix-build-on-ppc64le.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -u -r mesa-21.2.3.orig/include/CL/cl_platform.h mesa-21.2.3/include/CL/cl_platform.h ---- mesa-21.2.3.orig/include/CL/cl_platform.h 2021-10-14 12:26:03.866376943 +0200 -+++ mesa-21.2.3/include/CL/cl_platform.h 2021-10-14 20:37:44.557384820 +0200 -@@ -356,7 +356,9 @@ - /* Define basic vector types */ - #if defined( __VEC__ ) - #if !defined(__clang__) -+ #ifndef __cplusplus - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -+ #endif - #endif - typedef __vector unsigned char __cl_uchar16; - typedef __vector signed char __cl_char16; -diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c ---- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 12:26:04.058380655 +0200 -+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 20:38:55.478734888 +0200 -@@ -465,7 +465,9 @@ - - #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN - -+#ifndef __cplusplus - #include -+#endif - #include "util/u_pwr8.h" - - static inline void -diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c ---- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 12:26:04.058380655 +0200 -+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 20:38:24.766150222 +0200 -@@ -47,7 +47,9 @@ - #if defined(PIPE_ARCH_SSE) - #include - #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN -+#ifndef __cplusplus - #include -+#endif - #include "util/u_pwr8.h" - #endif -