From 4595dc5f6cd91e7d55c20c88761f072e8d2b982a Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 30 Sep 2024 16:40:33 +0000 Subject: [PATCH] import CS spirv-tools-2024.2-1.el9 --- .gitignore | 2 +- .spirv-tools.metadata | 2 +- SOURCES/fix-gcc12-build.patch | 12 ++++++++++++ SPECS/spirv-tools.spec | 9 +++++++-- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 SOURCES/fix-gcc12-build.patch diff --git a/.gitignore b/.gitignore index 808a693..d62d41c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/SPIRV-Tools-sdk-1.3.268.0.tar.gz +SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz diff --git a/.spirv-tools.metadata b/.spirv-tools.metadata index a9307cc..e6a9c86 100644 --- a/.spirv-tools.metadata +++ b/.spirv-tools.metadata @@ -1 +1 @@ -5915d4f18ea8661869f47c0711ac34a2f8d60756 SOURCES/SPIRV-Tools-sdk-1.3.268.0.tar.gz +b96c7ad5e38f678a16b3e3f0fb7be5f98178b036 SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz diff --git a/SOURCES/fix-gcc12-build.patch b/SOURCES/fix-gcc12-build.patch new file mode 100644 index 0000000..4ceeeef --- /dev/null +++ b/SOURCES/fix-gcc12-build.patch @@ -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 diff --git a/SPECS/spirv-tools.spec b/SPECS/spirv-tools.spec index 209ea75..b5bdcc5 100644 --- a/SPECS/spirv-tools.spec +++ b/SPECS/spirv-tools.spec @@ -1,9 +1,9 @@ %undefine __cmake_in_source_build -%global sdkver 1.3.268.0 +%global sdkver 1.3.283.0 Name: spirv-tools -Version: 2023.3 +Version: 2024.2 Release: 1%{?gitrel}%{?dist} Summary: API and commands for processing SPIR-V modules @@ -11,6 +11,8 @@ License: ASL 2.0 URL: https://github.com/KhronosGroup/SPIRV-Tools Source0: %url/archive/vulkan-sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz +Patch0: fix-gcc12-build.patch + BuildRequires: cmake3 BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -88,6 +90,9 @@ Development files for %{name} %{_libdir}/pkgconfig/SPIRV-Tools.pc %changelog +* Tue May 28 2024 José Expósito - 2024.2-1 +- Update to 1.3.283.0 SDK + * Wed Jan 17 2024 José Expósito - 2023.3-1 - Update to 1.3.268.0 SDK