From 7e421f4377ee32d850e3bbb332e65d13313f098f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Tue, 26 Aug 2025 18:22:03 -0700 Subject: [PATCH] chore: Split dxil into dxil and dxil-libs, allows both 32-bit and 64-bit support for spir-v to dxil (#6156) (#6160) * chore: Split dxil into dxil and dxil-libs, allows both 32-bit and 64-bit support for spir-v to dxil * chore: Increase release * chore: Make dependency on mesa-dxil arch neutral --------- (cherry picked from commit 7706984b3befd4c6af37657ba9c692757335c067) Signed-off-by: Kyle Gospodnetich Co-authored-by: Kyle Gospodnetich --- anda/lib/mesa/mesa.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index 98828d7e0c..5b0ba78478 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -80,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: 2%?dist +Release: 3%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org @@ -325,10 +325,18 @@ Summary: Mesa TensorFlow Lite delegate %if 0%{?with_d3d12} %package dxil -Summary: Mesa SPIR-V to DXIL libraries +Summary: Mesa SPIR-V to DXIL binary Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description dxil +Binary for translating SPIR-V shader code to DXIL for Direct3D 12 + +%package dxil-libs +Summary: Mesa SPIR-V to DXIL libraries +Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-dxil = %{?epoch:%{epoch}:}%{version}-%{release} + +%description dxil-libs Libraries for translating SPIR-V shader code to DXIL for Direct3D 12 %endif @@ -337,7 +345,7 @@ 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} +Requires: %{name}-dxil-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %endif Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} @@ -627,6 +635,7 @@ popd %if 0%{?with_d3d12} %files dxil %{_bindir}/spirv2dxil +%files dxil-libs %{_libdir}/libspirv_to_dxil.a %{_libdir}/libspirv_to_dxil.so %endif