Sync changes to SLFO-1.2 branch

_scmsync.obsinfo

@@ -1,4 +0,0 @@
-mtime: 1734295673
-commit: 6272520b8f7295acbbf1287a42ae9205b8acce0dbaf75c83c50af7a64e337014
-url: https://src.opensuse.org/jengelh/spirv-headers
-revision: master

build.specials.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91b1a9db094cf5109c7fb78d4e029db686e31f408f3e167abc1b937b6b6d6e7b
-size 256

spirv-headers.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Mar 13 16:52:55 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to tag SDK-1.4.309.0 (Git 00913f088)
+  * Version bump only
+
+-------------------------------------------------------------------
+Wed Mar 12 16:46:56 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 1.6.4+sdk309 (Git 09913f088)
+  * Add provisional key to grammar
+  * Grammar and header changes for SPV_INTEL_2d_block_io &
+    SPV_INTEL_subgroup_matrix_multiply_accumulate
+  * Add SPV_NV_cooperative_vector
+  * Updates IntegerFunctions2INTEL to remove Shader capability
+    dependency
+  * Add headers for SPV_NV_cluster_acceleration_structure &
+    SPV_NV_linear_swept_spheres
+
+-------------------------------------------------------------------
+Thu Mar  6 14:02:10 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+
+- Build with GCC 13 on Leap/SLES 15 in the hope to fix Mesa build
+  (bsc#1238713) 
+
 -------------------------------------------------------------------
 Sun Dec 15 20:43:19 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

spirv-headers.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package spirv-headers
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,23 +20,30 @@
 # Most recent tag is 1.5.4, but that is outdated.
 # CMakeLists.txt's project() line contains 1.5.5, but this is outdated too.
 # The SPIR-V version is 1.6.4 (include/spirv/unified1/spirv.core.grammar.json)
-# They add "SDK" tags that reflect the Vulkan version (1.3),
-# and the independently increasing toolchain release number (296).
+# They add "SDK" tags that reflect the Vulkan version (1.4),
+# and the independently increasing toolchain release number (309).
+
+# Leap 15 and SLES 15 defaults to GCC 7, which does not have stable C++17 ABI.
+# See https://bugzilla.suse.com/show_bug.cgi?id=1235697
+%if 0%{?suse_version} < 1600
+%define gcc_version 13
+%endif
 
 Name:           spirv-headers
-Version:        1.6.4+sdk303
-%define innerver 1.3.303
-%define rev cb6b2c32dbfc3257c1e9142a116fe9ee3d9b80a2
+Version:        1.6.4+sdk309
+%define innerver 1.4.309
+%define rev 09913f088a1197aba4aefd300a876b2ebbaa3391
 Release:        0
 Summary:        Machine-readable files from the SPIR-V registry
 License:        MIT
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/KhronosGroup/SPIRV-Headers
-Source:         https://github.com/KhronosGroup/SPIRV-Headers/archive/cb6b2c32dbfc3257c1e9142a116fe9ee3d9b80a2.tar.gz
+Source:         https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-%innerver.0.tar.gz
 BuildArch:      noarch
 BuildRequires:  cmake >= 2.8
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++
+BuildRequires:  gcc%{?gcc_version} >= 9
+BuildRequires:  gcc%{?gcc_version}-c++ >= 9
 BuildRequires:  pkg-config
 
 %description
@@ -49,10 +56,12 @@ registry. This includes:
 * The XML registry file.
 
 %prep
-%autosetup -n SPIRV-Headers-%rev -p1
+%autosetup -n SPIRV-Headers-vulkan-sdk-%innerver.0 -p1
 
 %build
-%cmake
+%cmake \
+	-DCMAKE_C_COMPILER="gcc%{?gcc_version:-%{gcc_version}}" \
+	-DCMAKE_CXX_COMPILER="g++%{?gcc_version:-%{gcc_version}}"
 %cmake_build
 
 %install