Update to 1.3.283.0 SDK

Resolves: https://issues.redhat.com/browse/RHEL-54285
This commit is contained in:
José Expósito 2024-09-11 09:24:47 +02:00
parent 1a9652aeab
commit 945288b62a
4 changed files with 33 additions and 16 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/SPIRV-Tools-sdk-1.3.224.0.tar.gz
/SPIRV-Tools-sdk-1.3.239.0.tar.gz
/SPIRV-Tools-sdk-1.3.250.1.tar.gz
/SPIRV-Tools-sdk-1.3.283.0.tar.gz

12
fix-gcc12-build.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma ./SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp
--- SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp.dma 2022-02-16 08:20:38.927239298 +1000
+++ SPIRV-Tools-45dd184c790d6bfc78a5a74a10c37e888b1823fa/source/spirv_target_env.cpp 2022-02-16 08:20:42.262301854 +1000
@@ -397,6 +397,8 @@ std::string spvLogStringForEnv(spv_targe
return "Unknown";
}
+// workaround gcc12/stdlibc++ -Wrestrict bug.
+#pragma GCC diagnostic ignored "-Wrestrict"
std::string spvTargetEnvList(const int pad, const int wrap) {
std::string ret;
size_t max_line_len = wrap - pad; // The first line isn't padded

View File

@ -1 +1 @@
SHA512 (SPIRV-Tools-sdk-1.3.250.1.tar.gz) = 29bd10d2222d552581a341e5f5905effe1ad620e42b9216ad06c79d3fa3aeee26cccb64e0ad1f6e556fb7143991ee390f0a1f64f14694d614421efc94a47c4e0
SHA512 (SPIRV-Tools-sdk-1.3.283.0.tar.gz) = 45c521307c8df2d74bdf811a50ff37028a45a77f58dcac910924f3490dfe3f8e9dacace77dab989d8d261528cd0f0a8e36ca7627dda608b9b09afb2e374736e5

View File

@ -1,17 +1,20 @@
%global sdkver 1.3.250.1
%undefine __cmake_in_source_build
%global sdkver 1.3.283.0
Name: spirv-tools
Version: 2023.1
Release: 3%{?dist}
Version: 2024.2
Release: 1%{?gitrel}%{?dist}
Summary: API and commands for processing SPIR-V modules
License: ASL 2.0
URL: https://github.com/KhronosGroup/SPIRV-Tools
Source0: %url/archive/sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
Source0: %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
Patch0: rhel8-workaround.patch
Patch1: fix-gcc12-build.patch
BuildRequires: cmake
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: ninja-build
%if 0%{?rhel} == 7
@ -42,22 +45,19 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Development files for %{name}
%prep
%autosetup -p1 -n SPIRV-Tools-sdk-%{sdkver}
%autosetup -p1 -n SPIRV-Tools-vulkan-sdk-%{sdkver}
%build
%__mkdir_p %_target_platform
pushd %_target_platform
%cmake -DCMAKE_BUILD_TYPE=Release \
%cmake3 -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=%{_lib} \
-DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
-DPYTHON_EXECUTABLE=%{__python3} \
-DSPIRV_TOOLS_BUILD_STATIC=OFF \
-GNinja ..
%ninja_build
popd
-GNinja
%cmake3_build
%install
%ninja_install -C %_target_platform
%cmake3_install
%ldconfig_scriptlets libs
@ -80,9 +80,9 @@ popd
%{_libdir}/libSPIRV-Tools-link.so
%{_libdir}/libSPIRV-Tools-lint.so
%{_libdir}/libSPIRV-Tools-opt.so
%{_libdir}/libSPIRV-Tools-shared.so
%{_libdir}/libSPIRV-Tools-reduce.so
%{_libdir}/libSPIRV-Tools.so
%{_libdir}/libSPIRV-Tools-reduce.so
%{_libdir}/libSPIRV-Tools-shared.so
%files devel
%{_includedir}/spirv-tools/
@ -91,6 +91,10 @@ popd
%{_libdir}/pkgconfig/SPIRV-Tools.pc
%changelog
* Tue Sep 10 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
- Update to 1.3.283.0 SDK
Resolves: https://issues.redhat.com/browse/RHEL-54285
* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 2023.1-3
- Update to 1.3.250.1 SDK version