From 5862c8f95a913532a3bb2447b24f886ba53f795bc6441af4dd7bf15a39627264 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 1 Mar 2022 18:32:43 +0000 Subject: [PATCH] - autoselect libvulkan_intel package via hardware supplements on Intel GPUs - autoselect libvulkan_radeon package via hardware supplements on AMD GPUs - no longer install libvulkan_lvp package (lavapipe=Software Vulkan driver), libvulkan_broadcom and libvulkan_freedreno packages by default, i.e. no longer have libvulkan_intel/libvulkan_radeon and libvulkan_lvp packages installed at the same time (boo#1180522) - libvulkan_intel/libvulkan_radeon/libvulkan_lvp now require Mesa-vulkan-device-select package, not the other way round! (baselibs.conf also adjusted) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1084 --- Mesa-drivers.changes | 15 +++++++++++++++ Mesa-drivers.spec | 35 +++++------------------------------ Mesa.changes | 15 +++++++++++++++ Mesa.spec | 35 +++++------------------------------ baselibs.conf | 29 ++--------------------------- 5 files changed, 42 insertions(+), 87 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 62cbc9d..c3e5ae5 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Mar 1 17:20:19 UTC 2022 - Stefan Dirsch + +- autoselect libvulkan_intel package via hardware supplements on + Intel GPUs +- autoselect libvulkan_radeon package via hardware supplements on + AMD GPUs +- no longer install libvulkan_lvp package (lavapipe=Software + Vulkan driver), libvulkan_broadcom and libvulkan_freedreno packages + by default, i.e. no longer have libvulkan_intel/libvulkan_radeon + and libvulkan_lvp packages installed at the same time (boo#1180522) +- libvulkan_intel/libvulkan_radeon/libvulkan_lvp now require + Mesa-vulkan-device-select package, not the other way round! + (baselibs.conf also adjusted) + ------------------------------------------------------------------- Thu Feb 24 09:04:46 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 5bfcda8..760f76b 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -645,7 +645,8 @@ This package contains the Mesa VA-API implementation provided through gallium. %package -n libvulkan_intel Summary: Mesa vulkan driver for Intel GPU Group: System/Libraries -Supplements: xf86-video-intel +Supplements: modalias(pci:v00008086d*sv*sd*bc03sc*i*) +Requires: Mesa-vulkan-device-select %description -n libvulkan_intel This package contains the Vulkan parts for Mesa. @@ -653,8 +654,8 @@ This package contains the Vulkan parts for Mesa. %package -n libvulkan_radeon Summary: Mesa vulkan driver for AMD GPU Group: System/Libraries -Supplements: xf86-video-amdgpu -Supplements: xf86-video-ati +Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) +Requires: Mesa-vulkan-device-select %description -n libvulkan_radeon This package contains the Vulkan parts for Mesa. @@ -662,6 +663,7 @@ This package contains the Vulkan parts for Mesa. %package -n libvulkan_lvp Summary: Mesa vulkan driver for LVP Group: System/Libraries +Requires: Mesa-vulkan-device-select %description -n libvulkan_lvp This package contains the Vulkan parts for Mesa. @@ -685,15 +687,6 @@ This package contains the Vulkan parts for Mesa. %package -n Mesa-libVulkan-devel Summary: Mesa's Vulkan development files Group: Development/Libraries/C and C++ -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -701,15 +694,6 @@ 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 -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-vulkan-device-select This package contains the VK_MESA_device_select Vulkan layer @@ -717,15 +701,6 @@ This package contains the VK_MESA_device_select Vulkan layer %package -n Mesa-vulkan-overlay Summary: Mesa Vulkan Overlay layer Group: System/Libraries -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-vulkan-overlay This package contains the VK_MESA_Overlay Vulkan layer diff --git a/Mesa.changes b/Mesa.changes index 62cbc9d..c3e5ae5 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Mar 1 17:20:19 UTC 2022 - Stefan Dirsch + +- autoselect libvulkan_intel package via hardware supplements on + Intel GPUs +- autoselect libvulkan_radeon package via hardware supplements on + AMD GPUs +- no longer install libvulkan_lvp package (lavapipe=Software + Vulkan driver), libvulkan_broadcom and libvulkan_freedreno packages + by default, i.e. no longer have libvulkan_intel/libvulkan_radeon + and libvulkan_lvp packages installed at the same time (boo#1180522) +- libvulkan_intel/libvulkan_radeon/libvulkan_lvp now require + Mesa-vulkan-device-select package, not the other way round! + (baselibs.conf also adjusted) + ------------------------------------------------------------------- Thu Feb 24 09:04:46 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 47cf6d4..a02a90e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -644,7 +644,8 @@ This package contains the Mesa VA-API implementation provided through gallium. %package -n libvulkan_intel Summary: Mesa vulkan driver for Intel GPU Group: System/Libraries -Supplements: xf86-video-intel +Supplements: modalias(pci:v00008086d*sv*sd*bc03sc*i*) +Requires: Mesa-vulkan-device-select %description -n libvulkan_intel This package contains the Vulkan parts for Mesa. @@ -652,8 +653,8 @@ This package contains the Vulkan parts for Mesa. %package -n libvulkan_radeon Summary: Mesa vulkan driver for AMD GPU Group: System/Libraries -Supplements: xf86-video-amdgpu -Supplements: xf86-video-ati +Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) +Requires: Mesa-vulkan-device-select %description -n libvulkan_radeon This package contains the Vulkan parts for Mesa. @@ -661,6 +662,7 @@ This package contains the Vulkan parts for Mesa. %package -n libvulkan_lvp Summary: Mesa vulkan driver for LVP Group: System/Libraries +Requires: Mesa-vulkan-device-select %description -n libvulkan_lvp This package contains the Vulkan parts for Mesa. @@ -684,15 +686,6 @@ This package contains the Vulkan parts for Mesa. %package -n Mesa-libVulkan-devel Summary: Mesa's Vulkan development files Group: Development/Libraries/C and C++ -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -700,15 +693,6 @@ 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 -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-vulkan-device-select This package contains the VK_MESA_device_select Vulkan layer @@ -716,15 +700,6 @@ This package contains the VK_MESA_device_select Vulkan layer %package -n Mesa-vulkan-overlay Summary: Mesa Vulkan Overlay layer Group: System/Libraries -%ifarch %{ix86} x86_64 -Requires: libvulkan_intel = %{version} -%endif -Requires: libvulkan_lvp = %{version} -Requires: libvulkan_radeon = %{version} -%ifarch %arm} aarch64 -Requires: libvulkan_broadcom = %{version} -Requires: libvulkan_freedreno = %{version} -%endif %description -n Mesa-vulkan-overlay This package contains the VK_MESA_Overlay Vulkan layer diff --git a/baselibs.conf b/baselibs.conf index 8f97b61..9c2f185 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -78,44 +78,19 @@ libvulkan_intel targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json + requires "Mesa-vulkan-device-select- = " libvulkan_radeon targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json -Mesa-libVulkan-devel - targetarch aarch64 requires "libvulkan_intel- = " - targetarch aarch64 requires "libvulkan_radeon- = " - targetarch ppc64 requires "libvulkan_intel- = " - targetarch ppc64 requires "libvulkan_radeon- = " - targetarch ppc64le requires "libvulkan_intel- = " - targetarch ppc64le requires "libvulkan_radeon- = " - targetarch x86_64 requires "libvulkan_intel- = " - targetarch x86_64 requires "libvulkan_radeon- = " + requires "Mesa-vulkan-device-select- = " libXvMC_nouveau libXvMC_r600 libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi -Mesa-vulkan-device-select - targetarch aarch64 requires "libvulkan_intel- = " - targetarch aarch64 requires "libvulkan_radeon- = " - targetarch ppc64 requires "libvulkan_intel- = " - targetarch ppc64 requires "libvulkan_radeon- = " - targetarch ppc64le requires "libvulkan_intel- = " - targetarch ppc64le requires "libvulkan_radeon- = " - targetarch x86_64 requires "libvulkan_intel- = " - targetarch x86_64 requires "libvulkan_radeon- = " -Mesa-vulkan-overlay - targetarch aarch64 requires "libvulkan_intel- = " - targetarch aarch64 requires "libvulkan_radeon- = " - targetarch ppc64 requires "libvulkan_intel- = " - targetarch ppc64 requires "libvulkan_radeon- = " - targetarch ppc64le requires "libvulkan_intel- = " - targetarch ppc64le requires "libvulkan_radeon- = " - targetarch x86_64 requires "libvulkan_intel- = " - targetarch x86_64 requires "libvulkan_radeon- = " Mesa-dri-vc4 Mesa-dri-nouveau Mesa-dri