From f7f11be01db255af63fdb947ce20b0ea2e768283 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 4 May 2025 22:25:25 -0700 Subject: [PATCH] [frawhide] fix(mesa): remove duplicated vulkan_drivers (#4637) (#4650) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This extra line accidentally removes the virtio vulkan driver from the final mesa-vulkan-drivers package, as documented in the following bazzite issue: fixes: ublue-os/bazzite #2472 Signed-off-by: José Pekkarinen (cherry picked from commit 6ac86ce5fd4b3f324bdcc23c1291be563af4e7ae) Co-authored-by: José Pekkarinen --- anda/lib/mesa/mesa.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 04b3105fea..59ebfc5835 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -68,7 +68,6 @@ %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: %{srcname} Summary: Mesa graphics libraries # Make the dep solver always prefer our Mesa over the distro's @@ -682,8 +681,8 @@ popd %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}/libvulkan_virtio.so +%{_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}