From c98bae3dd364ce4e30e44389e771e03ea26f2071c76c92530cd7336d41886b37 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 22 Mar 2022 11:17:15 +0000 Subject: [PATCH] - get rid of Mesa-libVulkan-devel(-32bit) package, which no longer makes sense since Mesa 21.1.0 * https://gitlab.freedesktop.org/mesa/mesa/-/commit/5e6db1916860ec217eac60903e0a9d10189d1c53 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1095 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 13 ------------- Mesa.changes | 7 +++++++ Mesa.spec | 13 ------------- baselibs.conf | 1 - 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 963e32e..66b5a5e 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 22 11:13:43 UTC 2022 - Stefan Dirsch + +- get rid of Mesa-libVulkan-devel(-32bit) package, which no longer + makes sense since Mesa 21.1.0 + * https://gitlab.freedesktop.org/mesa/mesa/-/commit/5e6db1916860ec217eac60903e0a9d10189d1c53 + ------------------------------------------------------------------- Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4e54918..61b3dd3 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -693,13 +693,6 @@ Group: System/Libraries This package contains the Vulkan parts for Mesa. %endif -%package -n Mesa-libVulkan-devel -Summary: Mesa's Vulkan development files -Group: Development/Libraries/C and C++ - -%description -n Mesa-libVulkan-devel -This package contains the development files for Mesa's Vulkan implementation. - %package -n Mesa-vulkan-device-select Summary: Vulkan layer to select Vulkan devices provided by Mesa Group: System/Libraries @@ -915,9 +908,6 @@ rm -rf %{buildroot}/%{_includedir}/KHR # workaround needed since Mesa 19.0.2 rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so -# dropped with Mesa 21.1.0 -mkdir -p -m 755 %{buildroot}/%{_includedir}/vulkan - %else rm -f %{buildroot}/%{_libdir}/dri/*_dri.so @@ -1207,9 +1197,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_datadir}/vulkan/icd.d/freedreno_icd.*.json %endif -%files -n Mesa-libVulkan-devel -%dir %{_includedir}/vulkan - %files -n Mesa-vulkan-device-select %{_libdir}/libVkLayer_MESA_device_select.so %dir %{_datadir}/vulkan diff --git a/Mesa.changes b/Mesa.changes index 963e32e..66b5a5e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 22 11:13:43 UTC 2022 - Stefan Dirsch + +- get rid of Mesa-libVulkan-devel(-32bit) package, which no longer + makes sense since Mesa 21.1.0 + * https://gitlab.freedesktop.org/mesa/mesa/-/commit/5e6db1916860ec217eac60903e0a9d10189d1c53 + ------------------------------------------------------------------- Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 63a9330..baa19fe 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -692,13 +692,6 @@ Group: System/Libraries This package contains the Vulkan parts for Mesa. %endif -%package -n Mesa-libVulkan-devel -Summary: Mesa's Vulkan development files -Group: Development/Libraries/C and C++ - -%description -n Mesa-libVulkan-devel -This package contains the development files for Mesa's Vulkan implementation. - %package -n Mesa-vulkan-device-select Summary: Vulkan layer to select Vulkan devices provided by Mesa Group: System/Libraries @@ -914,9 +907,6 @@ rm -rf %{buildroot}/%{_includedir}/KHR # workaround needed since Mesa 19.0.2 rm -f %{buildroot}/%{_libdir}/vdpau/libvdpau_gallium.so -# dropped with Mesa 21.1.0 -mkdir -p -m 755 %{buildroot}/%{_includedir}/vulkan - %else rm -f %{buildroot}/%{_libdir}/dri/*_dri.so @@ -1206,9 +1196,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_datadir}/vulkan/icd.d/freedreno_icd.*.json %endif -%files -n Mesa-libVulkan-devel -%dir %{_includedir}/vulkan - %files -n Mesa-vulkan-device-select %{_libdir}/libVkLayer_MESA_device_select.so %dir %{_datadir}/vulkan diff --git a/baselibs.conf b/baselibs.conf index 8dc36e9..5d6a801 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -85,7 +85,6 @@ libvulkan_radeon targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json requires "Mesa-vulkan-device-select- = " -Mesa-libVulkan-devel libXvMC_nouveau libXvMC_r600 libvdpau_nouveau