From e91989b57b3d2bca1809471f1a5fac329b99ec1eee82fc47732a642f7573378e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 6 May 2021 19:08:38 +0000 Subject: [PATCH] - adjusted filelist to removed vulkan files in Mesa 21.1.0 (packages Mesa-libVulkan-devel, Mesa-vulkan-device-select, Mesa-vulkan-overlay) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1036 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 11 +++-------- Mesa.changes | 7 +++++++ Mesa.spec | 11 +++-------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 041575d..2527db1 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 6 19:00:36 UTC 2021 - Stefan Dirsch + +- adjusted filelist to removed vulkan files in Mesa 21.1.0 + (packages Mesa-libVulkan-devel, Mesa-vulkan-device-select, + Mesa-vulkan-overlay) + ------------------------------------------------------------------- Thu May 6 14:24:29 UTC 2021 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index ac49546..62c109e 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -861,9 +861,10 @@ rm -rf %{buildroot}/%{_includedir}/KHR # workaround needed since Mesa 19.0.2 rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so -# /usr/include/vulkan/vulkan_intel.h dropped with Mesa 21.1.0, but -# let's keep the package containing an empty directory +# dropped with Mesa 21.1.0 mkdir -p -m 755 %{buildroot}/%{_includedir}/vulkan +mkdir -p -m 755 %{buildroot}/%{_datadir}/vulkan/implicit_layer.d +mkdir -p -m 755 %{buildroot}/%{_datadir}/vulkan/explicit_layer.d %else @@ -1136,20 +1137,14 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan -#%{_includedir}/vulkan/* %files -n Mesa-vulkan-device-select -%{_libdir}/libVkLayer_MESA_device_select.so %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/implicit_layer.d -%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json %files -n Mesa-vulkan-overlay -%{_bindir}/mesa-overlay-control.py -%{_libdir}/libVkLayer_MESA_overlay.so %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/explicit_layer.d -%{_datadir}/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %endif %changelog diff --git a/Mesa.changes b/Mesa.changes index 041575d..2527db1 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 6 19:00:36 UTC 2021 - Stefan Dirsch + +- adjusted filelist to removed vulkan files in Mesa 21.1.0 + (packages Mesa-libVulkan-devel, Mesa-vulkan-device-select, + Mesa-vulkan-overlay) + ------------------------------------------------------------------- Thu May 6 14:24:29 UTC 2021 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index fb2782d..8c8e65a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -860,9 +860,10 @@ rm -rf %{buildroot}/%{_includedir}/KHR # workaround needed since Mesa 19.0.2 rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so -# /usr/include/vulkan/vulkan_intel.h dropped with Mesa 21.1.0, but -# let's keep the package containing an empty directory +# dropped with Mesa 21.1.0 mkdir -p -m 755 %{buildroot}/%{_includedir}/vulkan +mkdir -p -m 755 %{buildroot}/%{_datadir}/vulkan/implicit_layer.d +mkdir -p -m 755 %{buildroot}/%{_datadir}/vulkan/explicit_layer.d %else @@ -1135,20 +1136,14 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan -#%{_includedir}/vulkan/* %files -n Mesa-vulkan-device-select -%{_libdir}/libVkLayer_MESA_device_select.so %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/implicit_layer.d -%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json %files -n Mesa-vulkan-overlay -%{_bindir}/mesa-overlay-control.py -%{_libdir}/libVkLayer_MESA_overlay.so %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/explicit_layer.d -%{_datadir}/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %endif %changelog