add patches

4 files changed, 75 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eebfabab8074..47db1352f779 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -81,9 +81,13 @@ pkgbase = mesa-aco-rc
 	replaces = mesa-llvm-rc
 	replaces = mesa-git
 	source = https://archive.mesa3d.org/mesa-20.3.0-rc2.tar.xz
+	source = 0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch
+	source = 0003-evergreen-big-endian.patch
 	source = LICENSE
 	md5sums = SKIP
 	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = mesa-aco-rc
 
diff --git a/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch b/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch
new file mode 100644
index 000000000000..7bccc532b088
--- /dev/null
+++ b/0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch
@@ -0,0 +1,27 @@
+From ddb159f7b8ead04b8ebfda0796bea8e9c6aee788 Mon Sep 17 00:00:00 2001
+From: Thomas Crider <gloriouseggroll@gmail.com>
+Date: Thu, 16 Jul 2020 21:43:19 -0600
+Subject: [PATCH] util: workaround LTO compilation break since 18cb8f23
+To: wine-devel <wine-devel@winehq.org>
+
+Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com>
+---
+ src/util/format/u_format.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h
+index 4b182ff558d..1d7e50d5bc9 100644
+--- a/src/util/format/u_format.h
++++ b/src/util/format/u_format.h
+@@ -406,7 +406,7 @@ struct util_format_description
+ 
+ 
+ const struct util_format_description *
+-util_format_description(enum pipe_format format) ATTRIBUTE_CONST;
++util_format_description(enum pipe_format format);
+ 
+ 
+ /*
+-- 
+2.26.2
+
diff --git a/0003-evergreen-big-endian.patch b/0003-evergreen-big-endian.patch
new file mode 100644
index 000000000000..ccf1717c7153
--- /dev/null
+++ b/0003-evergreen-big-endian.patch
@@ -0,0 +1,26 @@
+From 0ec3bdb2264b491fd3f5dc4e638b4c12611ef219 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Sun, 20 Mar 2016 13:27:45 +0100
+Subject: [PATCH 3/4] evergreen big endian
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ src/gallium/drivers/r600/r600_state_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
+index cac240e..4b620a1 100644
+--- a/src/gallium/drivers/r600/r600_state_common.c
++++ b/src/gallium/drivers/r600/r600_state_common.c
+@@ -2716,7 +2716,7 @@ uint32_t r600_translate_colorformat(enum chip_class chip, enum pipe_format forma
+ 
+ uint32_t r600_colorformat_endian_swap(uint32_t colorformat, bool do_endian_swap)
+ {
+-	if (R600_BIG_ENDIAN) {
++	if (0 && R600_BIG_ENDIAN) {
+ 		switch(colorformat) {
+ 		/* 8-bit buffers. */
+ 		case V_0280A0_COLOR_4_4:
+-- 
+2.7.4
+
diff --git a/PKGBUILD b/PKGBUILD
index 7d758e49de37..520c347d348d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,10 +21,28 @@ replaces=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-mesa-layer
 provides=("mesa" "opencl-mesa" "vulkan-intel" "vulkan-radeon" "vulkan-driver" "vulkan-mesa-layer" "libva-mesa-driver" "mesa-vdpau" "opengl-driver" "opencl-driver"
           "mesa-libgl")
 source=("https://archive.mesa3d.org/mesa-${versiontag}.tar.xz"
+        "0001-util-workaround-LTO-compilation-break-since-18cb8f23.patch"
+        "0003-evergreen-big-endian.patch"
         "LICENSE")
 md5sums=("SKIP"
+         "SKIP"
+         "SKIP"
          "SKIP")
 
+prepare(){
+  cd mesa-${versiontag}
+  
+  # Apply any patch
+  local src
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    [[ $src = *.patch ]] || continue
+    msg2 "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
+}
+
 build(){
   cd mesa-${versiontag}