diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 92abe4f00e..98828d7e0c 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -29,7 +29,6 @@ %ifarch %{ix86} x86_64 %global with_crocus 1 %global with_iris 1 -%global with_intel_clc 1 %global intel_platform_vulkan %{?with_vulkan_hw:,intel,intel_hasvk}%{!?with_vulkan_hw:%{nil}} %if !0%{?rhel} %global with_i915 1 @@ -72,7 +71,7 @@ %bcond_with valgrind %endif -%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}%{?with_virtio:,virtio} +%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?asahi_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau}%{?with_virtio:,virtio}%{?with_d3d12:,microsoft-experimental} Name: %{srcname} Summary: Mesa graphics libraries @@ -81,7 +80,7 @@ Summary: Mesa graphics libraries # disabled by default, and has to be enabled manually. See `terra/release/terra-mesa.repo` for details. Epoch: 1 Version: 25.2.1 -Release: 1%?dist +Release: 2%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -156,7 +155,7 @@ BuildRequires: flatbuffers-devel BuildRequires: flatbuffers-compiler BuildRequires: xtensor-devel %endif -%if 0%{?with_opencl} || 0%{?with_nvk} || 0%{?with_intel_clc} || 0%{?with_asahi} || 0%{?with_panfrost} +%if 0%{?with_opencl} || 0%{?with_nvk} || 0%{?with_asahi} || 0%{?with_panfrost} BuildRequires: clang-devel BuildRequires: pkgconfig(libclc) BuildRequires: pkgconfig(SPIRV-Tools) @@ -180,9 +179,7 @@ BuildRequires: pkgconfig(valgrind) %endif BuildRequires: python3-devel BuildRequires: python3-mako -%if 0%{?with_intel_clc} BuildRequires: python3-ply -%endif BuildRequires: python3-pycparser BuildRequires: python3-pyyaml BuildRequires: vulkan-headers @@ -326,10 +323,22 @@ Summary: Mesa TensorFlow Lite delegate %{summary}. %endif +%if 0%{?with_d3d12} +%package dxil +Summary: Mesa SPIR-V to DXIL libraries +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description dxil +Libraries for translating SPIR-V shader code to DXIL for Direct3D 12 +%endif + %package vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan%{_isa} Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%if 0%{?with_d3d12} +Requires: %{name}-dxil%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%endif Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description vulkan-drivers @@ -385,9 +394,6 @@ export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/" -Dglx=dri \ -Degl=enabled \ -Dglvnd=enabled \ -%if 0%{?with_intel_clc} - -Dintel-clc=enabled \ -%endif -Dvideo-codecs=all \ -Dintel-rt=%{?with_intel_vk_rt:enabled}%{!?with_intel_vk_rt:disabled} \ -Dmicrosoft-clc=disabled \ @@ -618,6 +624,13 @@ popd %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1* %endif +%if 0%{?with_d3d12} +%files dxil +%{_bindir}/spirv2dxil +%{_libdir}/libspirv_to_dxil.a +%{_libdir}/libspirv_to_dxil.so +%endif + %files vulkan-drivers %{_libdir}/libvulkan_lvp.so %{_datadir}/vulkan/icd.d/lvp_icd.*.json @@ -637,6 +650,10 @@ popd %{_libdir}/libvulkan_nouveau.so %{_datadir}/vulkan/icd.d/nouveau_icd.*.json %endif +%if 0%{?with_d3d12} +%{_libdir}/libvulkan_dzn.so +%{_datadir}/vulkan/icd.d/dzn_icd.*.json +%endif %ifarch %{ix86} x86_64 %{_libdir}/libvulkan_intel.so %{_datadir}/vulkan/icd.d/intel_icd.*.json