From 57e7407a3b16d3a177ff6ac2102e1bc58045a488 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 28 Nov 2020 15:49:14 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mesa.git#a8d9dcff3fb45a392e2b0b43f3c9e888315d9f63 --- mesa.spec | 74 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/mesa.spec b/mesa.spec index 56cc43d..2553979 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,23 +1,21 @@ %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_drivers nouveau,r100,r200 +%global base_dri nouveau,r100,r200 +%global base_vulkan amd %endif %ifarch %{ix86} x86_64 -%global platform_drivers ,i915,i965 %global with_iris 1 %global with_vmware 1 %global with_xa 1 -%global vulkan_drivers intel,amd -%else -%ifnarch s390x -%global vulkan_drivers amd -%endif +%global platform_dri ,i915,i965 +%global platform_vulkan ,intel %endif %ifarch %{arm} aarch64 @@ -46,13 +44,14 @@ %bcond_with valgrind %endif -%global dri_drivers %{?base_drivers}%{?platform_drivers} +%global dri_drivers %{?base_dri}%{?platform_dri} +%global vulkan_drivers %{?base_vulkan}%{?platform_vulkan} Name: mesa Summary: Mesa graphics libraries %global ver 20.2.3 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -66,7 +65,6 @@ BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gettext - %if 0%{?with_hardware} BuildRequires: kernel-headers %endif @@ -123,9 +121,14 @@ BuildRequires: pkgconfig(valgrind) %endif BuildRequires: python3-devel BuildRequires: python3-mako -%if 0%{?with_hardware} +%if 0%{?with_vulkan} 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}. @@ -294,6 +297,7 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release %{summary}. %endif +%if 0%{?with_vulkan} %package vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan%{_isa} @@ -308,6 +312,7 @@ Requires: vulkan-devel %description vulkan-devel Headers for development with the Vulkan API. +%endif %prep %autosetup -n %{name}-%{ver} -p1 @@ -320,38 +325,38 @@ cp %{SOURCE1} docs/ %define _lto_cflags %{nil} %meson \ - -Dplatforms=x11,wayland,drm,surfaceless \ - -Ddri3=true \ + -Dplatforms=x11,wayland \ + -Ddri3=enabled \ -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:true}%{!?with_vdpau:false} \ - -Dgallium-xvmc=false \ + -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ + -Dgallium-xvmc=disabled \ -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ - -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \ - -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \ + -Dgallium-va=%{?with_vaapi:enabled}%{!?with_vaapi:disabled} \ + -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \ -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \ -Dvulkan-drivers=%{?vulkan_drivers} \ - -Dshared-glapi=true \ - -Dgles1=false \ - -Dgles2=true \ + -Dvulkan-device-select-layer=true \ + -Dshared-glapi=enabled \ + -Dgles1=disabled \ + -Dgles2=enabled \ -Dopengl=true \ - -Dgbm=true \ + -Dgbm=enabled \ -Dglx=dri \ - -Degl=true \ + -Degl=enabled \ -Dglvnd=true \ -Dasm=%{?with_asm:true}%{!?with_asm:false} \ - -Dllvm=true \ - -Dshared-llvm=true \ - -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \ + -Dllvm=enabled \ + -Dshared-llvm=enabled \ + -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \ -Dbuild-tests=false \ -Dselinux=true \ - -Dosmesa=gallium \ - -Dvulkan-device-select-layer=true \ %{nil} %meson_build @@ -467,6 +472,10 @@ 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 @@ -539,9 +548,6 @@ 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} @@ -559,8 +565,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 @@ -569,16 +575,18 @@ 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 +* Sat Nov 28 2020 Peter Robinson - 20.2.3-2 +- Cleanup vulkan conditionals +- Update meson options and nomenclature + * Tue Nov 24 2020 Pete Walter - 20.2.3-1 - Update to 20.2.3