Merge branch 'f42' into Owen-sz-patch-3-1

This commit is contained in:
Owen Zimmerman
2025-08-26 21:20:25 -05:00
committed by GitHub
6 changed files with 20 additions and 11 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
%global ver 2025-08-26
%global ver 2025-08-27
%global goodver %(echo %ver | sed 's/-//g')
%global __brp_mangle_shebangs %{nil}
%bcond_without mold
@@ -1,6 +1,6 @@
%global commit 9a56e779374a522ca5503cf51426d16172bf4c65
%global commit c1ab41afac8d8522ac25c3c1ad1de651f0c4d4d5
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global fulldate 2025-08-25
%global fulldate 2025-08-26
%global commit_date %(echo %{fulldate} | sed 's/-//g')
%global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
%global ver 1.1.4
+2 -2
View File
@@ -1,6 +1,6 @@
%global commit 633ce23ae974211de452683e6d5b2e1a0bf21431
%global commit d0aef3cec196216b741dec1f8bfad3e69ed83beb
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250826
%global commit_date 20250827
%global ver 0.202.0
%bcond_with check
+11 -2
View File
@@ -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}
@@ -635,6 +643,7 @@ popd
%if 0%{?with_d3d12}
%files dxil
%{_bindir}/spirv2dxil
%files dxil-libs
%{_libdir}/libspirv_to_dxil.a
%{_libdir}/libspirv_to_dxil.so
%endif
@@ -1,7 +1,7 @@
%global debug_package %{nil}
%global commit 9bff73689ea2502f6e3bc34769fd699cde3ffeea
%global commit 9dd646ee2298cbb3cb58631f410890ef382309f6
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250627
%global commit_date 20250827
# Actual "release" version, currently unused as the release versions are back and forth on if on if they use 1.0.0 or 1.0.1
# Use this if they ever stop doing that I guess
%global ver 1.0.1
@@ -1,6 +1,6 @@
%global commit 7f2ec812ce042129215ccafc586b79e8b53e5f1c
%global commit 059ce35c31c5d7906d2886b0e1c235ef5b6f6da4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commitdate 20250826
%global commitdate 20250827
%global ver 1.0.15
Name: scx-scheds-nightly