From d376f64e62a076985d5919ffc152496c4d7fce811978cb37dfa0b2e8e43000ca Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 10:33:03 +0000 Subject: [PATCH 1/5] - try-to-fix-build-on-ppc64le.patch * trying to fix build on ppc64le (boo#1191569) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1062 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 4 ++++ Mesa.changes | 6 ++++++ Mesa.spec | 4 ++++ try-to-fix-build-on-ppc64le.patch | 22 ++++++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 100644 try-to-fix-build-on-ppc64le.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 03fd140..32299a5 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch + +- try-to-fix-build-on-ppc64le.patch + * trying to fix 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 f34618e..7071fae 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -135,6 +135,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch +Patch200: try-to-fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -770,6 +771,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 +%ifarch ppc64le +%patch200 -p1 +%endif # 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 03fd140..32299a5 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch + +- try-to-fix-build-on-ppc64le.patch + * trying to fix build on ppc64le (boo#1191569) + ------------------------------------------------------------------- Mon Oct 4 20:05:50 UTC 2021 - Aaron Puchert diff --git a/Mesa.spec b/Mesa.spec index 8f4c387..c30e39e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -134,6 +134,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch +Patch200: try-to-fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -769,6 +770,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 +%ifarch ppc64le +%patch200 -p1 +%endif # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/try-to-fix-build-on-ppc64le.patch b/try-to-fix-build-on-ppc64le.patch new file mode 100644 index 0000000..f50bee5 --- /dev/null +++ b/try-to-fix-build-on-ppc64le.patch @@ -0,0 +1,22 @@ +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 12:27:31.348068610 +0200 +@@ -465,7 +465,6 @@ + + #if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN + +-#include + #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 12:27:14.355740030 +0200 +@@ -47,7 +47,6 @@ + #if defined(PIPE_ARCH_SSE) + #include + #elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN +-#include + #include "util/u_pwr8.h" + #endif + From 07b6eef2951ce10ea1d06e04fb87857f687cb78919f7c54070f7d41562c3f29d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 18:43:05 +0000 Subject: [PATCH 2/5] redone try-to-fix-build-on-ppc64le.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1063 --- try-to-fix-build-on-ppc64le.patch | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/try-to-fix-build-on-ppc64le.patch b/try-to-fix-build-on-ppc64le.patch index f50bee5..2e0a4b6 100644 --- a/try-to-fix-build-on-ppc64le.patch +++ b/try-to-fix-build-on-ppc64le.patch @@ -1,22 +1,39 @@ +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 12:27:31.348068610 +0200 -@@ -465,7 +465,6 @@ ++++ 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 --#include ++#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 12:27:14.355740030 +0200 -@@ -47,7 +47,6 @@ ++++ 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 --#include ++#ifndef __cplusplus + #include ++#endif #include "util/u_pwr8.h" #endif From db75c856b7397133bebb76b9ba795838b3a234df122b7c392dc28e7ff26b4b5f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 19:18:31 +0000 Subject: [PATCH 3/5] - u_fix-build-on-ppc64le.patch * fixes build on ppc64le (boo#1191569) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1064 --- Mesa-drivers.changes | 4 ++-- Mesa-drivers.spec | 4 +--- Mesa.changes | 4 ++-- Mesa.spec | 4 +--- ...on-ppc64le.patch => u_fix-build-on-ppc64le.patch | 13 ------------- 5 files changed, 6 insertions(+), 23 deletions(-) rename try-to-fix-build-on-ppc64le.patch => u_fix-build-on-ppc64le.patch (61%) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 32299a5..744c6b7 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch -- try-to-fix-build-on-ppc64le.patch - * trying to fix build on ppc64le (boo#1191569) +- 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 7071fae..1a2b362 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -135,7 +135,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch -Patch200: try-to-fix-build-on-ppc64le.patch +Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -771,9 +771,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 -%ifarch ppc64le %patch200 -p1 -%endif # 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 32299a5..744c6b7 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Oct 14 10:30:57 UTC 2021 - Stefan Dirsch -- try-to-fix-build-on-ppc64le.patch - * trying to fix build on ppc64le (boo#1191569) +- 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 c30e39e..8d10672 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -134,7 +134,7 @@ Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch101: U_gallivm-add-new-wrapper-around-Module.patch Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch -Patch200: try-to-fix-build-on-ppc64le.patch +Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -770,9 +770,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch101 -p1 %patch102 -p1 -%ifarch ppc64le %patch200 -p1 -%endif # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/try-to-fix-build-on-ppc64le.patch b/u_fix-build-on-ppc64le.patch similarity index 61% rename from try-to-fix-build-on-ppc64le.patch rename to u_fix-build-on-ppc64le.patch index 2e0a4b6..82aed40 100644 --- a/try-to-fix-build-on-ppc64le.patch +++ b/u_fix-build-on-ppc64le.patch @@ -1,16 +1,3 @@ -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 From 8c6bfd9623d370d1758002f653716c7f4926254e670cc60dd3dd977ee7bc7272 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 14 Oct 2021 19:41:06 +0000 Subject: [PATCH 4/5] hopefully fixed (again) u_fix-build-on-ppc64le.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1065 --- u_fix-build-on-ppc64le.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/u_fix-build-on-ppc64le.patch b/u_fix-build-on-ppc64le.patch index 82aed40..2e0a4b6 100644 --- a/u_fix-build-on-ppc64le.patch +++ b/u_fix-build-on-ppc64le.patch @@ -1,3 +1,16 @@ +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 From 5eec58bd1cabf912c2ead725009f841607258be0ce2ee8c5f2d01f3784bd4445 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 15 Oct 2021 09:22:59 +0000 Subject: [PATCH 5/5] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1066 --- Mesa-drivers.changes | 11 ++++ Mesa-drivers.spec | 8 +-- Mesa.changes | 11 ++++ Mesa.spec | 8 +-- U_gallivm-add-new-wrapper-around-Module.patch | 60 ------------------ ...llivm-fix-FTBFS-on-i386-with-LLVM-13.patch | 52 --------------- mesa-21.2.3.tar.xz | 3 - mesa-21.2.3.tar.xz.sig | Bin 119 -> 0 bytes mesa-21.2.4.tar.xz | 3 + mesa-21.2.4.tar.xz.sig | Bin 0 -> 119 bytes 10 files changed, 29 insertions(+), 127 deletions(-) delete mode 100644 U_gallivm-add-new-wrapper-around-Module.patch delete mode 100644 U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch delete mode 100644 mesa-21.2.3.tar.xz delete mode 100644 mesa-21.2.3.tar.xz.sig create mode 100644 mesa-21.2.4.tar.xz create mode 100644 mesa-21.2.4.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 744c6b7..d778640 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 1a2b362..4b916bb 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.2.3 +%define _version 21.2.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -114,7 +114,7 @@ %endif Name: Mesa-drivers -Version: 21.2.3 +Version: 21.2.4 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -133,8 +133,6 @@ 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 -Patch101: U_gallivm-add-new-wrapper-around-Module.patch -Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes @@ -769,8 +767,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch58 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 %patch200 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms diff --git a/Mesa.changes b/Mesa.changes index 744c6b7..d778640 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index 8d10672..5f06918 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.2.3 +%define _version 21.2.4 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -113,7 +113,7 @@ %endif Name: Mesa -Version: 21.2.3 +Version: 21.2.4 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -132,8 +132,6 @@ 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 -Patch101: U_gallivm-add-new-wrapper-around-Module.patch -Patch102: U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch Patch200: u_fix-build-on-ppc64le.patch BuildRequires: bison BuildRequires: fdupes @@ -768,8 +766,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %endif %patch58 -p1 %patch100 -p1 -%patch101 -p1 -%patch102 -p1 %patch200 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms diff --git a/U_gallivm-add-new-wrapper-around-Module.patch b/U_gallivm-add-new-wrapper-around-Module.patch deleted file mode 100644 index e2560e5..0000000 --- a/U_gallivm-add-new-wrapper-around-Module.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 deleted file mode 100644 index 153c427..0000000 --- a/U_gallivm-fix-FTBFS-on-i386-with-LLVM-13.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 deleted file mode 100644 index 978fda5..0000000 --- a/mesa-21.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ab21e96486b2c1a6020bfda01fb73867a9ee2d8bb6e011f083d703f9b5cf9676..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rlo)biIs+G{08GT{D#QPR zX%8Q*=-ZPlldw0*^M$@tzR0n=r@v0#ZpmH~s;fFTj^Uq%vAB9+;!OXwio6y6p+AA=3Ne-<(!X9 V)sosf|7nBk^m#>dSA_*L0s!_>G0p%0 literal 0 HcmV?d00001