From 359a5459c8a56445dce592729fdedbc403f2d69b Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 9 Dec 2024 01:41:18 +0800 Subject: [PATCH] fix: mesa (#2577) * fix: mesa Signed-off-by: madomado * Update terra-mesa.spec Signed-off-by: madomado * fix a --------- Signed-off-by: madomado --- anda/lib/mesa/terra-mesa.spec | 68 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/anda/lib/mesa/terra-mesa.spec b/anda/lib/mesa/terra-mesa.spec index 0934e3e18e..59b065a3eb 100644 --- a/anda/lib/mesa/terra-mesa.spec +++ b/anda/lib/mesa/terra-mesa.spec @@ -1,15 +1,5 @@ %global srcname mesa -## START: Set by rpmautospec -## (rpmautospec version 0.6.3) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec - %ifnarch s390x %global with_hardware 1 %global with_radeonsi 1 @@ -21,11 +11,12 @@ %global with_r300 1 %global with_r600 1 %global with_nine 1 -%global with_nvk %{with vulkan_hw} -%global with_omx 1 +%if 0%{?with_vulkan_hw} +%global with_nvk %{with_vulkan_hw} +%endif %global with_opencl 1 %endif -%global base_vulkan ,amd +%global base_vulkan %{?with_vulkan_hw:,amd}%{!?with_vulkan_hw:%{nil}} %endif %ifnarch %{ix86} @@ -40,25 +31,27 @@ %global with_iris 1 %global with_xa 1 %global with_intel_clc 1 -%global intel_platform_vulkan ,intel,intel_hasvk +%global intel_platform_vulkan %{?with_vulkan_hw:,intel,intel_hasvk}%{!?with_vulkan_hw:%{nil}} %endif %ifarch x86_64 +%if !0%{?with_vulkan_hw} %global with_intel_vk_rt 1 %endif +%endif %ifarch aarch64 x86_64 %{ix86} +%global with_kmsro 1 %if !0%{?rhel} %global with_lima 1 %global with_vc4 1 -%endif %global with_etnaviv 1 -%global with_freedreno 1 -%global with_kmsro 1 -%global with_panfrost 1 %global with_tegra 1 +%endif +%global with_freedreno 1 +%global with_panfrost 1 %global with_v3d 1 %global with_xa 1 -%global extra_platform_vulkan ,broadcom,freedreno,panfrost,imagination-experimental +%global extra_platform_vulkan %{?with_vulkan_hw:,broadcom,freedreno,panfrost,imagination-experimental}%{!?with_vulkan_hw:%{nil}} %endif %if !0%{?rhel} @@ -72,6 +65,7 @@ %bcond_with valgrind %endif +%global vulkan_drivers swrast,virtio%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} %global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} Name: terra-%{srcname} Summary: Mesa graphics libraries @@ -458,7 +452,6 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/" %meson \ -Dplatforms=x11,wayland \ - -Ddri3=enabled \ -Dosmesa=true \ %if 0%{?with_hardware} -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \ @@ -543,7 +536,7 @@ popd %{_includedir}/GL/internal/dri_interface.h %{_libdir}/pkgconfig/dri.pc %{_libdir}/libglapi.so - + %files libEGL %{_datadir}/glvnd/egl_vendor.d/50_mesa.json %{_libdir}/libEGL_mesa.so.0* @@ -551,11 +544,11 @@ popd %dir %{_includedir}/EGL %{_includedir}/EGL/eglext_angle.h %{_includedir}/EGL/eglmesaext.h - + %files libglapi %{_libdir}/libglapi.so.0 %{_libdir}/libglapi.so.0.* - + %files libOSMesa %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel @@ -563,22 +556,23 @@ popd %{_includedir}/GL/osmesa.h %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc - + %files libgbm +%{_libdir}/gbm/dri_gbm.so %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* %files libgbm-devel %{_libdir}/libgbm.so %{_includedir}/gbm.h %{_libdir}/pkgconfig/gbm.pc - + %if 0%{?with_xa} %files libxatracker %if 0%{?with_hardware} %{_libdir}/libxatracker.so.2 %{_libdir}/libxatracker.so.2.* %endif - + %files libxatracker-devel %if 0%{?with_hardware} %{_libdir}/libxatracker.so @@ -588,35 +582,35 @@ popd %{_libdir}/pkgconfig/xatracker.pc %endif %endif - + %if 0%{?with_teflon} %files libTeflon %{_libdir}/libteflon.so %endif - + %if 0%{?with_opencl} %files libOpenCL %{_libdir}/libMesaOpenCL.so.* %{_libdir}/libRusticlOpenCL.so.* %{_sysconfdir}/OpenCL/vendors/mesa.icd %{_sysconfdir}/OpenCL/vendors/rusticl.icd - + %files libOpenCL-devel %{_libdir}/libMesaOpenCL.so %{_libdir}/libRusticlOpenCL.so %endif - + %if 0%{?with_nine} %files libd3d %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* - + %files libd3d-devel %{_libdir}/pkgconfig/d3d.pc %{_includedir}/d3dadapter/ %{_libdir}/d3d/*.so %endif - + %files dri-drivers %{_datadir}/drirc.d/00-mesa-defaults.conf %{_libdir}/libgallium-*.so @@ -624,7 +618,7 @@ popd %{_libdir}/dri/libdril_dri.so %{_libdir}/dri/swrast_dri.so %{_libdir}/dri/virtio_gpu_dri.so - + %if 0%{?with_hardware} %if 0%{?with_r300} %{_libdir}/dri/r300_dri.so @@ -715,7 +709,7 @@ popd %if 0%{?with_vulkan_hw} %{_libdir}/dri/zink_dri.so %endif - + %if 0%{?with_va} %files va-drivers %{_libdir}/dri/nouveau_drv_video.so @@ -727,7 +721,7 @@ popd %endif %{_libdir}/dri/virtio_gpu_drv_video.so %endif - + %if 0%{?with_vdpau} %files vdpau-drivers %dir %{_libdir}/vdpau @@ -740,10 +734,12 @@ popd %endif %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1* %endif - + %files vulkan-drivers %{_libdir}/libvulkan_lvp.so %{_datadir}/vulkan/icd.d/lvp_icd.*.json +%dnl %{_libdir}/libvulkan_virtio.so +%dnl %{_datadir}/vulkan/icd.d/virtio_icd.*.json %{_libdir}/libVkLayer_MESA_device_select.so %{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json %if 0%{?with_vulkan_hw}