From 40a80ae8c3c582457473a7dc9025dda4d19be1bf Mon Sep 17 00:00:00 2001
From: mgb01105731 <mgb01105731@alibaba-inc.com>
Date: Tue, 19 Mar 2024 13:45:27 +0800
Subject: [PATCH] rebuild with new llvm

---
 0004-change-scalar-if.patch | 35 +++++++++++++++++++++++++++++++++++
 mesa.spec                   |  8 +++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0004-change-scalar-if.patch

diff --git a/0004-change-scalar-if.patch b/0004-change-scalar-if.patch
new file mode 100644
index 0000000..3e50630
--- /dev/null
+++ b/0004-change-scalar-if.patch
@@ -0,0 +1,35 @@
+From f86713ac5484b89894a051aee31ce563c79adb1e Mon Sep 17 00:00:00 2001
+From: Chunmei Xu <xuchunmei@linux.alibaba.com>
+Date: Wed, 20 Mar 2024 10:33:19 +0800
+Subject: [PATCH 1/1] change scalar if
+
+---
+ src/gallium/auxiliary/gallivm/lp_bld_init.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+index 9cf9749..b383629 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
+@@ -42,14 +42,14 @@
+ 
+ #include <llvm/Config/llvm-config.h>
+ #include <llvm-c/Analysis.h>
+-#include <llvm-c/Transforms/Scalar.h>
+-#if LLVM_VERSION_MAJOR >= 7
+-#include <llvm-c/Transforms/Utils.h>
+-#endif
+ #include <llvm-c/BitWriter.h>
+ #if GALLIVM_USE_NEW_PASS == 1
+ #include <llvm-c/Transforms/PassBuilder.h>
+ #elif GALLIVM_HAVE_CORO == 1
++#include <llvm-c/Transforms/Scalar.h>
++#if LLVM_VERSION_MAJOR >= 7
++#include <llvm-c/Transforms/Utils.h>
++#endif
+ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64 || DETECT_ARCH_LOONGARCH64)
+ #include <llvm-c/Transforms/IPO.h>
+ #endif
+-- 
+2.41.0
+
diff --git a/mesa.spec b/mesa.spec
index 122ecb5..bb88a04 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -1,4 +1,4 @@
-%define anolis_release 2
+%define anolis_release 3
 
 %bcond_without hardware
 
@@ -43,6 +43,9 @@ Patch1001: 0001-gallivm-temporary-disable-coroutines-on-loongarch64.patch
 Patch1002: 0002-gallivm-arit-use-LLVMBuildFPToUI-when-the-float-is-n.patch
 Patch1003: 0003-gallivm-add-more-optlevel-for-debug-purpose-on-loong.patch
 
+#rebuild with new llvm
+Patch1004: 0004-change-scalar-if.patch
+
 BuildRequires: gcc, gcc-c++, gettext, meson >= 1.0.0
 %if %{with hardware}
 BuildRequires: kernel-headers
@@ -793,6 +796,9 @@ ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
 %endif
 
 %changelog
+* Tue Mar 19 2024 mgb01105731 <mgb01105731@alibaba-inc.com> - 23.1.8-3
+- Rebuild with new llvm
+
 * Fri Nov 3 2023 Xiaojuan Yang <yangxiaojuan@loongson.cn> - 23.1.8-2
 - Support Loongarch64
 
-- 
Gitee