.gitignore

@@ -1 +1 @@
-SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz
+SOURCES/SPIRV-Tools-sdk-1.3.250.1.tar.gz

.spirv-tools.metadata

@@ -1 +1 @@
-b96c7ad5e38f678a16b3e3f0fb7be5f98178b036 SOURCES/SPIRV-Tools-sdk-1.3.283.0.tar.gz
+439077bbca3bbe1e4129b75a1650509620d04ed5 SOURCES/SPIRV-Tools-sdk-1.3.250.1.tar.gz

SOURCES/fix-gcc12-build.patch

@@ -1,12 +0,0 @@
-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

SPECS/spirv-tools.spec

@@ -1,20 +1,17 @@
-%undefine __cmake_in_source_build
+%global sdkver 1.3.250.1
-
-%global sdkver 1.3.283.0
 
 Name:           spirv-tools
-Version:        2024.2
+Version:        2023.1
-Release:        1%{?gitrel}%{?dist}
+Release:        3%{?dist}
 Summary:        API and commands for processing SPIR-V modules
 
 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
+Source0:        %url/archive/sdk-%{sdkver}.tar.gz#/SPIRV-Tools-sdk-%{sdkver}.tar.gz
 
 Patch0: rhel8-workaround.patch
-Patch1: fix-gcc12-build.patch
 
-BuildRequires:  cmake3
+BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  ninja-build
 %if 0%{?rhel} == 7
@@ -45,19 +42,22 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Development files for %{name}
 
 %prep
-%autosetup -p1 -n SPIRV-Tools-vulkan-sdk-%{sdkver}
+%autosetup -p1 -n SPIRV-Tools-sdk-%{sdkver}
 
 %build
-%cmake3 -DCMAKE_BUILD_TYPE=Release \
+%__mkdir_p %_target_platform
+pushd %_target_platform
+%cmake -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \
         -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
         -DPYTHON_EXECUTABLE=%{__python3} \
         -DSPIRV_TOOLS_BUILD_STATIC=OFF \
-        -GNinja
+        -GNinja ..
-%cmake3_build
+%ninja_build
+popd
 
 %install
-%cmake3_install
+%ninja_install -C %_target_platform
 
 %ldconfig_scriptlets libs
 
@@ -80,9 +80,9 @@ Development files for %{name}
 %{_libdir}/libSPIRV-Tools-link.so
 %{_libdir}/libSPIRV-Tools-lint.so
 %{_libdir}/libSPIRV-Tools-opt.so
-%{_libdir}/libSPIRV-Tools.so
-%{_libdir}/libSPIRV-Tools-reduce.so
 %{_libdir}/libSPIRV-Tools-shared.so
+%{_libdir}/libSPIRV-Tools-reduce.so
+%{_libdir}/libSPIRV-Tools.so
 
 %files devel
 %{_includedir}/spirv-tools/
@@ -91,10 +91,6 @@ Development files for %{name}
 %{_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