!47 add macros to control if need ft_surface

From: @zppzhangpan 
Reviewed-by: @anonymous_z, @t_feng 
Signed-off-by: @t_feng

add_fangtian_support.patch

@@ -63,7 +63,7 @@ index bd54e78..9a762fc 100644
 +if with_platform_ohos
 +  pre_args += '-DHAVE_OHOS_PLATFORM'
 +  dep_ohos = [
-+      dependency('ft_surface_wrapper'),
++      dependency('ft_surface'),
 +  ]
 +endif
  prog_python = import('python').find_installation('python3')
@@ -1651,36 +1651,3 @@ index 65faf60..e04ca63 100644
  elif with_platform_haiku
    incs_for_egl += inc_haikugl
    c_args_for_egl += [
-diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
-index 5e00657..29d5df3 100644
---- a/src/gallium/drivers/freedreno/freedreno_util.h
-+++ b/src/gallium/drivers/freedreno/freedreno_util.h
-@@ -44,6 +44,15 @@
- #include "adreno_pm4.xml.h"
- #include "disasm.h"
- 
-+#include <unistd.h>
-+#include <sys/syscall.h>
-+
-+#ifndef SYS_gettid
-+#error "SYS_gettid unavailable on this system"
-+#endif
-+
-+#define gettid() ((pid_t)syscall(SYS_gettid))
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
-index b8c4468..352ece2 100644
---- a/src/gallium/drivers/r600/r600_state_common.c
-+++ b/src/gallium/drivers/r600/r600_state_common.c
-@@ -3198,7 +3198,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:

mesa.spec

@@ -30,6 +30,14 @@
 %define with_etnaviv   1
 %endif
 
+%ifarch x86_64 aarch64
+%if %{?openEuler:1}0
+%define with_ft        1
+%else
+%define with_ft        0
+%endif
+%endif
+
 %global dri_drivers %{?platform_drivers}
 
 %if 0%{?with_vulkan_hw}
@@ -47,7 +55,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        21.3.1
-Release:        4
+Release:        6
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -55,6 +63,7 @@ Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
 
 Patch1:         backport-fix-build-err-on-arm.patch
 Patch2:         0001-evergreen-big-endian.patch
+Patch3:         add_fangtian_support.patch
 
 Patch1000:      1000-add-loongarch-support-not-upstream-modified.patch
 Patch1001:      1001-add-loongarch-support-not-upstream-new.patch
@@ -115,7 +124,9 @@ BuildRequires: llvm-toolset-7-runtime
 %enable_llvmtoolset7
 %endif
 
-BuildRequires: ft_surface_wrapper
+%if 0%{?with_ft}
+BuildRequires: ft_surface-devel
+%endif
 
 %description
 %{summary}.
@@ -150,6 +161,10 @@ Provides:       libGL-devel%{?_isa}
 Summary:        Mesa libEGL runtime libraries
 Requires:       libglvnd-egl%{?_isa} >= 1:1.2.0-1
 
+%if 0%{?with_ft}
+Requires: ft_surface
+%endif
+
 %description libEGL
 %{summary}.
 
@@ -160,6 +175,10 @@ Requires:       libglvnd-devel%{?_isa} >= 1:1.2.0-1
 Provides:       libEGL-devel
 Provides:       libEGL-devel%{?_isa}
 
+%if 0%{?with_ft}
+Requires: ft_surface
+%endif
+
 %description libEGL-devel
 %{summary}.
 
@@ -310,7 +329,11 @@ sed -i -e 's/cpp_std=gnu++11/cpp_std=gnu++14/g' meson.build
 export ASFLAGS="--generate-missing-build-notes=yes"
 %meson -Dcpp_std=gnu++14 \
   -Db_ndebug=true \
-  -Dplatforms=x11,wayland,ohos \
+%if 0%{?with_ft}
+  -Dplatforms=x11,wayland%{?with_ft:,ohos} \
+%else
+  -Dplatforms=x11,wayland \
+%endif
   -Ddri3=enabled \
   -Ddri-drivers=%{?dri_drivers} \
   -Dosmesa=true \
@@ -566,7 +589,10 @@ done
 %endif
 
 %changelog
-* Tue Oct 17 2023 yanansong <songyanan5@huawei.com> - 21.3.1-4
+* Wed Mar 6 2024 zhangpan <zhangpan103@h-partners.com> - 21.3.1-6
+- add macros to control if need ft_surface
+
+* Tue Oct 17 2023 yanansong <songyanan5@huawei.com> - 21.3.1-5
 - Add fangtian
 
 * Tue Aug 29 2023 herengui <herengui@kylinsec.com.cn> - 21.3.1-4