8 changed files with 133 additions and 92 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,6 @@
-SOURCES/SPIRV-Tools-sdk-1.3.239.0.tar.gz
+/spirv-tools-*.tar.gz
+/SPIRV-Tools-sdk-1.3.216.0.tar.gz
+/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.268.0.tar.gz
--- a/.spirv-tools.metadata
+++ b/.spirv-tools.metadata
@ -1 +1 @@
-86216f8f5c49ab1625f71b5b5f758602334bf45d SOURCES/SPIRV-Tools-sdk-1.3.239.0.tar.gz
+5915d4f18ea8661869f47c0711ac34a2f8d60756 SPIRV-Tools-sdk-1.3.268.0.tar.gz
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+# spirv-tools
+
+The spirv-tools package
--- a/SOURCES/0001-opt-fix-spirv-ABI-on-Linux-again.patch
+++ b/SOURCES/0001-opt-fix-spirv-ABI-on-Linux-again.patch
@ -1,52 +0,0 @@
-From 743578474de0736850286c2c6d2b796a923b1a7c Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 15 Feb 2023 16:50:24 +1000
-Subject: [PATCH] opt: fix spirv ABI on Linux again.
-
-Breaking the ABI for this API isn't worth it when the fix is so simple.
---
- include/spirv-tools/optimizer.hpp |  6 ++++--
- source/opt/optimizer.cpp          | 10 ++++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/include/spirv-tools/optimizer.hpp b/include/spirv-tools/optimizer.hpp
-index aa6a614e..8bdd4e82 100644
--- a/include/spirv-tools/optimizer.hpp
-+++ b/include/spirv-tools/optimizer.hpp
-@@ -525,8 +525,10 @@ Optimizer::PassToken CreateDeadInsertElimPass();
- // If |remove_outputs| is true, allow outputs to be removed from the interface.
- // This is only safe if the caller knows that there is no corresponding input
- // variable in the following shader. It is false by default.
-Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface = false,
-                                             bool remove_outputs = false);
-+Optimizer::PassToken CreateAggressiveDCEPass();
-+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface);
-+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface,
-+                                             bool remove_outputs);
- 
- // Creates a remove-unused-interface-variables pass.
- // Removes variables referenced on the |OpEntryPoint| instruction that are not
-diff --git a/source/opt/optimizer.cpp b/source/opt/optimizer.cpp
-index cbc4b82f..46a92dd9 100644
--- a/source/opt/optimizer.cpp
-+++ b/source/opt/optimizer.cpp
-@@ -785,6 +785,16 @@ Optimizer::PassToken CreateLocalMultiStoreElimPass() {
-       MakeUnique<opt::SSARewritePass>());
- }
- 
-+Optimizer::PassToken CreateAggressiveDCEPass() {
-+  return MakeUnique<Optimizer::PassToken::Impl>(
-+      MakeUnique<opt::AggressiveDCEPass>(false, false));
-+}
-+
-+Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface) {
-+  return MakeUnique<Optimizer::PassToken::Impl>(
-+      MakeUnique<opt::AggressiveDCEPass>(preserve_interface, false));
-+}
-+
- Optimizer::PassToken CreateAggressiveDCEPass(bool preserve_interface,
-                                              bool remove_outputs) {
-   return MakeUnique<Optimizer::PassToken::Impl>(
-- 
-2.39.1
-
--- a/fix-shared-libs.patch
+++ b/fix-shared-libs.patch
@ -0,0 +1,36 @@
+diff -up SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/link/CMakeLists.txt.dma SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/link/CMakeLists.txt
+--- SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/link/CMakeLists.txt.dma	2020-08-04 14:12:02.354651856 +1000
+++ SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/link/CMakeLists.txt	2020-08-04 14:12:11.728900944 +1000
+@@ -11,7 +11,7 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-add_library(SPIRV-Tools-link STATIC
+add_library(SPIRV-Tools-link
+   linker.cpp
+ )
+ 
+diff -up SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/opt/CMakeLists.txt.dma SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/opt/CMakeLists.txt
+--- SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/opt/CMakeLists.txt.dma	2020-08-04 01:45:24.000000000 +1000
+++ SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/opt/CMakeLists.txt	2020-08-04 14:11:54.629446580 +1000
+@@ -233,7 +233,7 @@ endif()
+ 
+ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt)
+ 
+-add_library(SPIRV-Tools-opt STATIC ${SPIRV_TOOLS_OPT_SOURCES})
+add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
+ 
+ spvtools_default_compile_options(SPIRV-Tools-opt)
+ target_include_directories(SPIRV-Tools-opt
+diff -up SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/reduce/CMakeLists.txt.dma SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/reduce/CMakeLists.txt
+--- SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/reduce/CMakeLists.txt.dma	2020-08-04 01:45:24.000000000 +1000
+++ SPIRV-Tools-92a71657fcbae77caf79181f655fabe8be7e0d84/source/reduce/CMakeLists.txt	2020-08-04 14:11:54.630446606 +1000
+@@ -77,7 +77,7 @@ endif()
+ 
+ spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce)
+ 
+-add_library(SPIRV-Tools-reduce STATIC ${SPIRV_TOOLS_REDUCE_SOURCES})
+add_library(SPIRV-Tools-reduce ${SPIRV_TOOLS_REDUCE_SOURCES})
+ 
+ spvtools_default_compile_options(SPIRV-Tools-reduce)
+ target_include_directories(SPIRV-Tools-reduce
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (SPIRV-Tools-sdk-1.3.268.0.tar.gz) = 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899
--- a/SPECS/spirv-tools.spec
+++ b/SPECS/spirv-tools.spec
@ -1,17 +1,17 @@
-%global sdkver 1.3.239.0
+%undefine __cmake_in_source_build
+
+%global sdkver 1.3.268.0

 Name:           spirv-tools
-Version:        2023.1
-Release:        2%{?dist}
+Version:        2023.3
+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:         0001-opt-fix-spirv-ABI-on-Linux-again.patch
-
-BuildRequires:  cmake
+BuildRequires:  cmake3
 BuildRequires:  gcc-c++
 BuildRequires:  ninja-build
 %if 0%{?rhel} == 7
@ -42,22 +42,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

@ -70,6 +67,7 @@ popd
 %{_bindir}/spirv-lesspipe.sh
 %{_bindir}/spirv-link
 %{_bindir}/spirv-lint
+%{_bindir}/spirv-objdump
 %{_bindir}/spirv-opt
 %{_bindir}/spirv-reduce
 %{_bindir}/spirv-val
@ -79,9 +77,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/
@ -90,43 +88,87 @@ popd
 %{_libdir}/pkgconfig/SPIRV-Tools.pc

 %changelog
+* Wed Jan 17 2024 José Expósito <jexposit@redhat.com> - 2023.3-1
+- Update to 1.3.268.0 SDK
+
+* 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
- fix spirv-tools ABI break
+- Restore spirv-tools ABI

-* Mon Feb 13 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
- Update to 1.3.239.0 SDK version
+* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 2023.1-1
+- Update to 1.3.239.0 SDK release

-* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
- Update to 1.3.224.0 SDK version
+* Fri Aug 26 2022 Dave Airlie <airlied@redhat.com> - 2022.2-3
+- Update to 1.3.224.0 SDK release.

-* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 2022.2-1
- Update to 1.3.216.0 SDK version
+* Wed Jun 22 2022 Dave Airlie <airlied@redhat.com> - 2022.2-2
+- Update to 1.3.216.0 SDK release.

-* Mon Feb 21 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1
- Update to 1.3.204.0 SDK version
+* Sat Feb 26 2022 Dave Airlie <airlied@redhat.com> - 2022.1-2.20220202.git45dd184
+- workaround build problem bump

-* Thu Jan 28 2021 Dave Airlie <airlied@redhat.com> - 2020.5-3
+* Fri Feb 25 2022 Dave Airlie <airlied@redhat.com> - 2022.1-1.20220202.git45dd184
+- 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 Aug 05 2020 Dave Airlie <airlied@redhat.com> - 2020.5-1
- update to latest upstream
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.5-4.20201031.gitf7da527
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* 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
- update to latest upstream
-
-* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 2019.4-2
- rebuild for 8.2.0
+- git snapshot for newer glslang/validation layers

 * Tue Nov 12 2019 Dave Airlie <airlied@redhat.com> - 2019.4-1
- latest upstream snapshot
+- git snapshot for newer glslang/validation layers

-* Sun Aug 04 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
- Update to latest upstream for glslang
- drop spirv-stats as per upstream.
+* Thu Aug 01 2019 Dave Airlie <airlied@redhat.com> - 2019.4-0.1
+- git snapshot to let newer vulkan validation layers build
+- stats removed upstream

-* Thu Mar 07 2019 Dave Airlie <airlied@redhat.com> - 2019.1-1
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019.3-2
+- 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
				`@ -0,0 +1 @@`
				`SHA512 (SPIRV-Tools-sdk-1.3.268.0.tar.gz) = 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899`