.gitignore

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

SOURCES/rhel8-workaround.patch

@@ -0,0 +1,13 @@
+diff -up SPIRV-Tools-sdk-1.3.250.1/CMakeLists.txt.dma SPIRV-Tools-sdk-1.3.250.1/CMakeLists.txt
+diff -up SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt.dma SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt
+--- SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt.dma	2023-07-12 15:03:54.303896734 +1000
++++ SPIRV-Tools-sdk-1.3.250.1/tools/CMakeLists.txt	2023-07-12 15:05:46.480030301 +1000
+@@ -74,7 +74,7 @@ if (NOT ${SPIRV_SKIP_EXECUTABLES})
+                            objdump/extract_source.cpp
+                            util/cli_consumer.cpp
+                            ${COMMON_TOOLS_SRCS}
+-                      LIBS ${SPIRV_TOOLS_FULL_VISIBILITY})
++                      LIBS ${SPIRV_TOOLS_FULL_VISIBILITY} stdc++fs)
+     target_include_directories(spirv-objdump PRIVATE ${spirv-tools_SOURCE_DIR}
+                                                      ${SPIRV_HEADER_INCLUDE_DIR})
+     set(SPIRV_INSTALL_TARGETS ${SPIRV_INSTALL_TARGETS} spirv-objdump)

SPECS/spirv-tools.spec

@@ -11,7 +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
+Patch0: rhel8-workaround.patch
+Patch1: fix-gcc12-build.patch
 
 BuildRequires:  cmake3
 BuildRequires:  gcc-c++
@@ -90,90 +91,50 @@ Development files for %{name}
 %{_libdir}/pkgconfig/SPIRV-Tools.pc
 
 %changelog
-* Tue May 28 2024 José Expósito <jexposit@redhat.com> - 2024.2-1
+* 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 Jan 17 2024 José Expósito <jexposit@redhat.com> - 2023.3-1
+* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 2023.1-3
-- Update to 1.3.268.0 SDK
+- Update to 1.3.250.1 SDK version
-
-* Thu Jul 06 2023 Dave Airlie <airlied@redhat.com> - 2023.1-3
-- Update to 1.3.250.1 SDK release
 
 * Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-2
-- Restore spirv-tools ABI
+- fix spirv-tools ABI break
 
-* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
+* Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
-- Update to 1.3.239.0 SDK release
+- Update to 1.3.239.0 SDK version
 
-* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 2022.2-3
+* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
-- Update to 1.3.224.0 SDK release.
+- Update to 1.3.224.0 SDK version
 
-* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
+* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 2022.2-1
-- Update to 1.3.216.0 SDK release.
+- Update to 1.3.216.0 SDK version
 
-* Sat Feb 26 2022 Dave Airlie <airlied@redhat.com> - 2022.1-2.20220202.git45dd184
+* Mon Feb 21 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1
-- workaround build problem bump
+- Update to 1.3.204.0 SDK version
 
-* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1.20220202.git45dd184
+* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-3
-- Update to 1.3.204.0 SDK Version
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2021.2-2.20210619.git5dd2f76
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jul 30 2021 Dave Airlie <airlied@redhat.com> - 2021.2-1
-- Update to 1.2.182.0 SDK Version
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2020.5-6.20201208.gitb27b1af
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-5
 - Update to 1.2.162.0 SDK version
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.5-4.20201031.gitf7da527
+* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 2020.5-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- update to latest upstream
-
-* Fri Dec 04 2020 Jeff Law <law@redhat.com> - 2020.5-3.20201031.gitf7da5277
-- Fix undesirable strncpy call to instead use memcpy to avoid
-  gcc-11 diagnostic
-
-* Mon Nov 02 2020 Dave Airlie <airlied@redhat.com> - 2020.5-2.20201031.gitf7da5277
-- update to latest spirv-tools
-
-* Tue Aug 04 2020 Dave Airlie <airlied@redhat.com> - 2029.5-1.20200803.git92a71657
-- update to latest spirv-tools
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.5-3.20200421.git67f4838
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Apr 22 2020 Dave Airlie <airlied@redhat.cvom> - 2019.5-2
-- git snapshot for newer glslang/validation layers
 
 * Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 2019.5-1
-- git snapshot for newer glslang/validation layers
+- update to latest upstream
+
+* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 2019.4-2
+- rebuild for 8.2.0
 
 * Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 2019.4-1
-- git snapshot for newer glslang/validation layers
+- latest upstream snapshot
 
-* Thu Aug 01 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
+* Sun Aug 04 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
-- git snapshot to let newer vulkan validation layers build
+- Update to latest upstream for glslang
-- stats removed upstream
+- drop spirv-stats as per upstream.
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.3-2
+* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jun 10 13:46:33 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 2019.3-1
-- Release 2019.3
-
-* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-2
-- Add patch to let vulkan-validation-layers build
-
-* Mon Feb 04 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
 - Update to 2019.1 release
 
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Mon Jul 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.4-1
 - Update to 2018.4 release