From 6cfd1ff7c6a416d8e55276b171e02fb5489484f0 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 21 Aug 2024 10:22:08 -0700 Subject: [PATCH] [frawhide] mesa-freeworld: handle gallium files (#1976) (#1978) * mesa-freeworld: handle gallium files (#1976) (cherry picked from commit 0ed17a3f8fde012d2d57378342c0e353a7e13f12) * %global with_gallium_video 1 Signed-off-by: madomado --------- Signed-off-by: madomado Co-authored-by: Cappy Ishihara Co-authored-by: madomado --- anda/system/mesa-freeworld/mesa-freeworld.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/anda/system/mesa-freeworld/mesa-freeworld.spec b/anda/system/mesa-freeworld/mesa-freeworld.spec index db95652ce4..3f50436d0c 100644 --- a/anda/system/mesa-freeworld/mesa-freeworld.spec +++ b/anda/system/mesa-freeworld/mesa-freeworld.spec @@ -65,6 +65,9 @@ algorithms and decoding only VC1 algorithm. %bcond_with valgrind %endif +# todo: set to 1 when mesa 24.2 gets in the repos +%global with_gallium_video 1 + #%%global vulkan_drivers swrast%%{?base_vulkan}%%{?intel_platform_vulkan}%%{?extra_platform_vulkan}%%{?with_nvk:,nouveau} Name: %{srcname}-freeworld @@ -314,6 +317,10 @@ rm -fr %{buildroot}%{_libdir}/dri/*_dri.so rm -fr %{buildroot}%{_libdir}/libvulkan*.so rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so +%if %{with_gallium_video} == 0 +rm -fr %{buildroot}%{_libdir}/dri/libgallium_drv_video.so +%endif + %if 0%{?with_va} %files -n %{srcname}-va-drivers-freeworld %{_libdir}/dri/nouveau_drv_video.so @@ -323,7 +330,12 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so %if 0%{?with_radeonsi} %{_libdir}/dri/radeonsi_drv_video.so %endif + + +%if %{with_gallium_video} == 1 %{_libdir}/dri/libgallium_drv_video.so +%endif + %{_libdir}/dri/virtio_gpu_drv_video.so %{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml %license docs/license.rst @@ -338,7 +350,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so %if 0%{?with_radeonsi} %{_libdir}/vdpau/libvdpau_radeonsi.so.1* %endif +%if 0%{?with_gallium_video} == 1 %{_libdir}/vdpau/libvdpau_gallium.so.1* +%endif %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1* %{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml %license docs/license.rst