The package rpms/mesa.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mesa.git/commit/?id=e24b70f39bc13....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit 79d8a62aa679c43ae95f951f8dc010ff1a52ad44
Merge: b1d210d e24b70f
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Tue Dec 15 07:25:57 2020 +0000
Merge remote-tracking branch 'origin/f33' into f32
commit e24b70f39bc134aa6db908b491535bc748d4c949
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Tue Dec 15 07:24:05 2020 +0000
Revert vulkan conditional changes as it broke s390x deps
It's too invasive to drop mesa-vulkan-drivers and mesa-vulkan-devel in a stable
release with other packages build requiring it.
This reverts commit a8d9dcff3fb45a392e2b0b43f3c9e888315d9f63.
This reverts commit 26ef46f507559d980e1e91f20e66463d5503bf3e.
diff --git a/mesa.spec b/mesa.spec
index d074c61..3502872 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -1,21 +1,23 @@
%ifnarch s390x
%global with_hardware 1
-%global with_vulkan 1
%global with_vdpau 1
%global with_vaapi 1
%global with_nine 1
%global with_omx 1
%global with_opencl 1
-%global base_dri nouveau,r100,r200
-%global base_vulkan amd
+%global base_drivers nouveau,r100,r200
%endif
%ifarch %{ix86} x86_64
+%global platform_drivers ,i915,i965
%global with_iris 1
%global with_vmware 1
%global with_xa 1
-%global platform_dri ,i915,i965
-%global platform_vulkan ,intel
+%global vulkan_drivers intel,amd
+%else
+%ifnarch s390x
+%global vulkan_drivers amd
+%endif
%endif
%ifarch %{arm} aarch64
@@ -44,14 +46,13 @@
%bcond_with valgrind
%endif
-%global dri_drivers %{?base_dri}%{?platform_dri}
-%global vulkan_drivers %{?base_vulkan}%{?platform_vulkan}
+%global dri_drivers %{?base_drivers}%{?platform_drivers}
Name: mesa
Summary: Mesa graphics libraries
%global ver 20.2.4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-",
"~"); print(ver)}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
URL:
http://www.mesa3d.org
@@ -65,6 +66,7 @@ BuildRequires: meson >= 0.45
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gettext
+
%if 0%{?with_hardware}
BuildRequires: kernel-headers
%endif
@@ -121,14 +123,9 @@ BuildRequires: pkgconfig(valgrind)
%endif
BuildRequires: python3-devel
BuildRequires: python3-mako
-%if 0%{?with_vulkan}
+%if 0%{?with_hardware}
BuildRequires: vulkan-headers
%endif
-%ifarch s390x
-# Vulkan not supported on s390x, packages were empty
-Obsoletes: mesa-vulkan-drivers < 20.2.3-2
-Obsoletes: mesa-vulkan-devel < 20.2.3-2
-%endif
%description
%{summary}.
@@ -297,7 +294,6 @@ Requires: %{name}-libd3d%{?_isa} =
%{?epoch:%{epoch}:}%{version}-%{release
%{summary}.
%endif
-%if 0%{?with_vulkan}
%package vulkan-drivers
Summary: Mesa Vulkan drivers
Requires: vulkan%{_isa}
@@ -312,7 +308,6 @@ Requires: vulkan-devel
%description vulkan-devel
Headers for development with the Vulkan API.
-%endif
%prep
%autosetup -n %{name}-%{ver} -p1
@@ -325,38 +320,38 @@ cp %{SOURCE1} docs/
%define _lto_cflags %{nil}
%meson \
- -Dplatforms=x11,wayland \
- -Ddri3=enabled \
+ -Dplatforms=x11,wayland,drm,surfaceless \
+ -Ddri3=true \
-Ddri-drivers=%{?dri_drivers} \
- -Dosmesa=gallium \
%if 0%{?with_hardware}
-Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}
\
%else
-Dgallium-drivers=swrast,virgl \
%endif
- -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
- -Dgallium-xvmc=disabled \
+ -Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \
+ -Dgallium-xvmc=false \
-Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
- -Dgallium-va=%{?with_vaapi:enabled}%{!?with_vaapi:disabled} \
- -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
+ -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
+ -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
-Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
-Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
-Dvulkan-drivers=%{?vulkan_drivers} \
- -Dvulkan-device-select-layer=true \
- -Dshared-glapi=enabled \
- -Dgles1=disabled \
- -Dgles2=enabled \
+ -Dshared-glapi=true \
+ -Dgles1=false \
+ -Dgles2=true \
-Dopengl=true \
- -Dgbm=enabled \
+ -Dgbm=true \
-Dglx=dri \
- -Degl=enabled \
+ -Degl=true \
-Dglvnd=true \
-Dasm=%{?with_asm:true}%{!?with_asm:false} \
- -Dllvm=enabled \
- -Dshared-llvm=enabled \
- -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \
+ -Dllvm=true \
+ -Dshared-llvm=true \
+ -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
-Dbuild-tests=false \
-Dselinux=true \
+ -Dosmesa=gallium \
+ -Dvulkan-device-select-layer=true \
%{nil}
%meson_build
@@ -472,10 +467,6 @@ popd
%files dri-drivers
%dir %{_datadir}/drirc.d
%{_datadir}/drirc.d/00-mesa-defaults.conf
-%{_libdir}/dri/kms_swrast_dri.so
-%{_libdir}/dri/swrast_dri.so
-%{_libdir}/dri/virtio_gpu_dri.so
-
%if 0%{?with_hardware}
%{_libdir}/dri/radeon_dri.so
%{_libdir}/dri/r200_dri.so
@@ -548,6 +539,9 @@ popd
%{_libdir}/dri/st7735r_dri.so
%{_libdir}/dri/sun4i-drm_dri.so
%endif
+%{_libdir}/dri/kms_swrast_dri.so
+%{_libdir}/dri/swrast_dri.so
+%{_libdir}/dri/virtio_gpu_dri.so
%if 0%{?with_hardware}
%if 0%{?with_omx}
@@ -565,8 +559,8 @@ popd
%endif
%endif
-%if 0%{?with_vulkan}
%files vulkan-drivers
+%if 0%{?with_hardware}
%ifarch %{ix86} x86_64
%{_libdir}/libvulkan_intel.so
%{_datadir}/vulkan/icd.d/intel_icd.*.json
@@ -575,14 +569,19 @@ popd
%{_datadir}/vulkan/icd.d/radeon_icd.*.json
%{_libdir}/libVkLayer_MESA_device_select.so
%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
+%endif
%files vulkan-devel
+%if 0%{?with_hardware}
%ifarch %{ix86} x86_64
%{_includedir}/vulkan/vulkan_intel.h
%endif
%endif
%changelog
+* Tue Dec 15 2020 Pete Walter <pwalter(a)fedoraproject.org> - 20.2.4-2
+- Revert vulkan conditional changes as it broke s390x deps
+
* Wed Dec 09 2020 Pete Walter <pwalter(a)fedoraproject.org> - 20.2.4-1
- Update to 20.2.4