[packages/Mesa] - updated meson and patch macros

qboosh qboosh at pld-linux.org
Sat Feb 8 11:22:12 CET 2025


commit 40d04e487ef9098ffd040225a98dce9020f2dee4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 8 10:20:00 2025 +0100

    - updated meson and patch macros

 Mesa.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/Mesa.spec b/Mesa.spec
index 4768ec0..9e91ff1 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -169,7 +169,7 @@ BuildRequires:	python3-PyYAML
 %ifarch %{arm} aarch64
 BuildRequires:	python3-pycparser >= 2.20
 %endif
-BuildRequires:	rpmbuild(macros) >= 2.007
+BuildRequires:	rpmbuild(macros) >= 2.042
 %if %{with gallium_rusticl} || %{with nvk}
 BuildRequires:	rust >= 1.76.0
 %endif
@@ -1220,7 +1220,7 @@ Sterownik Vulkan dla kart VirtIO.
 
 %prep
 %setup -q -n mesa-%{version}
-%patch0 -p1
+%patch -P0 -p1
 
 install -d subprojects/packagecache
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} subprojects/packagecache
@@ -1278,9 +1278,10 @@ export BINDGEN_EXTRA_CLANG_ARGS="-mfloat-abi=hard"
 %endif
 %endif
 
-%meson build \
+%meson \
 	--force-fallback-for=syn,unicode-ident,quote,proc-macro2 \
 	-Dplatforms=x11%{?with_wayland:,wayland} \
+	-Dandroid-libbacktrace=disabled \
 	-Ddri-drivers-path=%{_libdir}/xorg/modules/dri \
 	-Degl=%{?with_egl:enabled}%{!?with_egl:disabled} \
 	-Dgallium-drivers=${gallium_drivers} \
@@ -1304,6 +1305,7 @@ export BINDGEN_EXTRA_CLANG_ARGS="-mfloat-abi=hard"
 	-Dintel-rt=%{?with_intel_rt:enabled}%{!?with_intel_rt:disabled} \
 	-Dlibunwind=enabled \
 	-Dlmsensors=%{?with_lm_sensors:enabled}%{!?with_lm_sensors:disabled} \
+	-Dmicrosoft-clc=disabled \
 	%{?with_opencl_spirv:-Dopencl-spirv=true} \
 	-Dosmesa=true \
 	-Dsse2=%{__true_false sse2} \
@@ -1316,14 +1318,14 @@ export BINDGEN_EXTRA_CLANG_ARGS="-mfloat-abi=hard"
 	-Dimagination-srv=true
 %endif
 
-%ninja_build -C build
+%meson_build
 
-%{?with_tests:%ninja_test -C build}
+%{?with_tests:%meson_test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%ninja_install -C build
+%meson_install
 
 install -d $RPM_BUILD_ROOT%{_libdir}/gbm
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/40d04e487ef9098ffd040225a98dce9020f2dee4



More information about the pld-cvs-commit mailing list