added patch to solve build failure

3 files changed, 28 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db53799ae72a..82361d7b5771 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-mesa-minimal-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 21.1.0_devel.137120.a7c0cf500b3
+	pkgver = 21.2.0_devel.141308.50233d0daa3
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -52,12 +52,14 @@ pkgbase = lib32-mesa-minimal-git
 	source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git
 	source = LICENSE
 	source = llvm32.native
+	source = do-not-use-StackAlignmentOverride.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
 	md5sums = 6b4a19068a323d7f90a3d3cd315ed1f9
+	md5sums = 72a79be875f9b5cba273590b55922b0d
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
 	sha512sums = c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe
+	sha512sums = f1f2d93967756509aba883e6cc7a58dfdb59423b5bac0d7363c8585542e6813aa097ce7f22dafb9d1b7d9ceb5f179f48181d7509b831e3d46d13786e96778584
 
 pkgname = lib32-mesa-minimal-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 37595bcc6346..2b5183b78af7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=lib32-mesa-minimal-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=21.1.0_devel.137120.a7c0cf500b3
+pkgver=21.2.0_devel.141308.50233d0daa3
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -28,14 +28,17 @@ license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git'
                 'LICENSE'
                 'llvm32.native'
+                'do-not-use-StackAlignmentOverride.patch'
 )
 
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         '6b4a19068a323d7f90a3d3cd315ed1f9')
+         '6b4a19068a323d7f90a3d3cd315ed1f9'
+         '72a79be875f9b5cba273590b55922b0d')
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-            'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
+            'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe'
+            'f1f2d93967756509aba883e6cc7a58dfdb59423b5bac0d7363c8585542e6813aa097ce7f22dafb9d1b7d9ceb5f179f48181d7509b831e3d46d13786e96778584')
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
 # NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
@@ -52,6 +55,11 @@ prepare() {
     if [  -d _build ]; then
         rm -rf _build
     fi
+    
+    # build fails due to a change in llvm 13. only x86 32-bit uses the option , removing it as temp workaround seems safe.
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4906
+    cd mesa
+    patch --forward --strip=1 --input="${srcdir}/do-not-use-StackAlignmentOverride.patch"
 }
 
 build () {
diff --git a/do-not-use-StackAlignmentOverride.patch b/do-not-use-StackAlignmentOverride.patch
new file mode 100644
index 000000000000..d0fb46f7aca3
--- /dev/null
+++ b/do-not-use-StackAlignmentOverride.patch
@@ -0,0 +1,13 @@
+diff --unified --recursive --text mesa.org/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp mesa.new/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+--- mesa.org/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp	2021-06-18 12:47:17.096083970 +0200
++++ mesa.new/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp	2021-06-18 12:51:39.656887107 +0200
+@@ -351,7 +351,8 @@
+     */
+    TargetOptions options;
+ #if defined(PIPE_ARCH_X86)
+-   options.StackAlignmentOverride = 4;
++   //  options.StackAlignmentOverride = 4; 
++   // fails with llvm 13 , see https://gitlab.freedesktop.org/mesa/mesa/-/issues/4906
+ #endif
+ 
+    builder.setEngineKind(EngineKind::JIT)