From f6c15d579d236c814ba61e417a485ef8c88dab06 Mon Sep 17 00:00:00 2001 From: zhaojiale Date: Wed, 15 May 2024 09:34:38 +0800 Subject: [PATCH] Fix mips macro define error - this commit is used to fix 0002-26018_upstream_orcjit_patch_update.patch error Signed-off-by: zhaojiale --- 0004-Fix-mips-macro-define-error.patch | 38 ++++++++++++++++++++++++++ mesa.spec | 7 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0004-Fix-mips-macro-define-error.patch diff --git a/0004-Fix-mips-macro-define-error.patch b/0004-Fix-mips-macro-define-error.patch new file mode 100644 index 0000000..40bfc1c --- /dev/null +++ b/0004-Fix-mips-macro-define-error.patch @@ -0,0 +1,38 @@ +From 40eda076b7a59dc63b7866f4057a528fca6035ee Mon Sep 17 00:00:00 2001 +From: zhaojiale +Date: Wed, 15 May 2024 08:48:10 +0800 +Subject: [PATCH] Fix mips macro define error + +- this patch is used to fix mips macro define error + on 0002-upstream_orcjit_patch_update.patch + +Signed-off-by: zhaojiale +--- + src/util/detect_arch.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/util/detect_arch.h b/src/util/detect_arch.h +index c0f8cdb..048bdd7 100644 +--- a/src/util/detect_arch.h ++++ b/src/util/detect_arch.h +@@ -94,7 +94,7 @@ + #endif + + #if defined(__mips__) +-#define DETECT_ARCH_HPPA 1 ++#define DETECT_ARCH_MIPS 1 + #endif + + #if defined(__loongarch_lp64) || defined(__loongarch64) +@@ -151,7 +151,7 @@ + #endif + + #ifndef DETECT_ARCH_MIPS +-#define DETECT_ARCH_HPPA 0 ++#define DETECT_ARCH_MIPS 0 + #endif + + #ifndef DETECT_ARCH_LOONGARCH +-- +2.43.0 + diff --git a/mesa.spec b/mesa.spec index e4972be..f31e268 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %global with_hardware 1 %global with_vulkan_hw 1 @@ -52,6 +52,7 @@ Patch13: 0002-26018_upstream_orcjit_patch_update.patch Patch14: 0001-add_loongarch64_basic_support.patch Patch15: 0002-llvmpipe-support-loongarch64-orcjit.patch Patch16: 0003-llvmpipe-remove-useless-code.patch +Patch17: 0004-Fix-mips-macro-define-error.patch BuildRequires: meson BuildRequires: gcc @@ -640,6 +641,10 @@ popd %endif %changelog +* Wed May 15 2024 Jiale Zhao - 23.3.0-5 +- Fix mips macro define error. This commit is used to fix + 0002-26018_upstream_orcjit_patch_update.patch error. + * Mon May 13 2024 Jiale Zhao - 23.3.0-4 - Remove useless code -- Gitee