From e75f9aabf1cdb5c0ec8cdb09aad570badee00d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Tue, 28 May 2024 17:15:58 +0200 Subject: [PATCH] Update to 1.3.283.0 SDK --- .gitignore | 1 + fix-gcc12-build.patch | 12 ++++++++++++ sources | 2 +- spirv-tools.spec | 9 +++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 fix-gcc12-build.patch diff --git a/.gitignore b/.gitignore index 022a4ac..43f14da 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /SPIRV-Tools-sdk-1.3.239.0.tar.gz /SPIRV-Tools-sdk-1.3.250.1.tar.gz /SPIRV-Tools-sdk-1.3.268.0.tar.gz +/SPIRV-Tools-sdk-1.3.283.0.tar.gz diff --git a/fix-gcc12-build.patch b/fix-gcc12-build.patch new file mode 100644 index 0000000..4ceeeef --- /dev/null +++ b/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/sources b/sources index a7d8de1..d16e643 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SPIRV-Tools-sdk-1.3.268.0.tar.gz) = 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899 +SHA512 (SPIRV-Tools-sdk-1.3.283.0.tar.gz) = 45c521307c8df2d74bdf811a50ff37028a45a77f58dcac910924f3490dfe3f8e9dacace77dab989d8d261528cd0f0a8e36ca7627dda608b9b09afb2e374736e5 diff --git a/spirv-tools.spec b/spirv-tools.spec index 209ea75..b5bdcc5 100644 --- a/spirv-tools.spec +++ b/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