Accepting request 958702 from X11:XOrg

- baselibs.conf: readded mistakenly removed packages
  * Mesa-libVulkan-devel
  * Mesa-vulkan-device-select
  * Mesa-vulkan-overlay

- raise memory limit to 1024 in the hope of avoiding OOM on ppc64
  (boo#1196640)

- 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/request/show/958702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=431
This commit is contained in:
Dominique Leuenberger 2022-03-05 13:43:29 +00:00 committed by Git OBS Bridge
commit 226e802505
5 changed files with 72 additions and 86 deletions

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Mar 3 09:14:36 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- baselibs.conf: readded mistakenly removed packages
* Mesa-libVulkan-devel
* Mesa-vulkan-device-select
* Mesa-vulkan-overlay
-------------------------------------------------------------------
Wed Mar 2 13:32:42 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- raise memory limit to 1024 in the hope of avoiding OOM on ppc64
(boo#1196640)
-------------------------------------------------------------------
Tue Mar 1 17:20:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

View File

@ -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
@ -792,7 +767,7 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build
%build
# try to avoid OOM on ppc64 (boo#1194739)
%ifarch ppc64 ppc64le
%limit_build -m 750
%limit_build -m 1024
%endif
egl_platforms=x11,wayland

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Mar 3 09:14:36 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- baselibs.conf: readded mistakenly removed packages
* Mesa-libVulkan-devel
* Mesa-vulkan-device-select
* Mesa-vulkan-overlay
-------------------------------------------------------------------
Wed Mar 2 13:32:42 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- raise memory limit to 1024 in the hope of avoiding OOM on ppc64
(boo#1196640)
-------------------------------------------------------------------
Tue Mar 1 17:20:19 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- 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 <sndirsch@suse.com>

View File

@ -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
@ -791,7 +766,7 @@ sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build
%build
# try to avoid OOM on ppc64 (boo#1194739)
%ifarch ppc64 ppc64le
%limit_build -m 750
%limit_build -m 1024
%endif
egl_platforms=x11,wayland

View File

@ -78,20 +78,14 @@ 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-<targettype> = <version>"
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
requires "Mesa-vulkan-device-select-<targettype> = <version>"
Mesa-libVulkan-devel
targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
libXvMC_nouveau
libXvMC_r600
libvdpau_nouveau
@ -99,23 +93,7 @@ libvdpau_r300
libvdpau_r600
libvdpau_radeonsi
Mesa-vulkan-device-select
targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
Mesa-vulkan-overlay
targetarch aarch64 requires "libvulkan_intel-<targettype> = <version>"
targetarch aarch64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64 requires "libvulkan_radeon-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_intel-<targettype> = <version>"
targetarch ppc64le requires "libvulkan_radeon-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_intel-<targettype> = <version>"
targetarch x86_64 requires "libvulkan_radeon-<targettype> = <version>"
Mesa-dri-vc4
Mesa-dri-nouveau
Mesa-dri