Sync changes to SLFO-1.2 branch

spirv-tools.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Mar 13 16:56:20 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Bump BuildRequires to match spirv-headers
+
+-------------------------------------------------------------------
+Wed Mar 12 16:37:33 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2025.1~rc1
+  * Added OpImageSampleFootprintNV to IsAllowedSampledImageOperand
+  * spirv-val: Validate zero product workgroup size
+  * Added EXT_mesh_shader validation support
+  * Added support for SPV_INTEL_subgroup_matrix_multiply_accumulate
+  * Added SPV_AMDX_shader_enqueue version 2 support
+  * Now validates SPV_NV_cooperative_vector
+  * Added validation for SPV_NV_cluster_acceleration_structure,
+    SPV_NV_linear_swept_spheres
+
+-------------------------------------------------------------------
+Thu Mar  6 14:18:19 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 18:56:06 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

spirv-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package spirv-tools
 #
-# 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
@@ -17,29 +17,32 @@
 
 
 %define _lto_cflags %nil
-%define lname libSPIRV-Tools-2024_4_rc2
+%define lname libSPIRV-Tools-2025_1_rc1
+
+# 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-tools
-Version:        2024.4~rc2
+Version:        2025.1~rc1
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/KhronosGroup/SPIRV-Tools
-Source:         https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2024.4.rc2.tar.gz
+Source:         https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v2025.1.rc1.tar.gz
 Source9:        baselibs.conf
 Patch1:         ver.diff
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.17.2
-%if 0%{?suse_version} >= 1599
-BuildRequires:  gcc-c++
-%else
-BuildRequires:  gcc12-c++
-%endif
+BuildRequires:  gcc%{?gcc_version} >= 9
+BuildRequires:  gcc%{?gcc_version}-c++ >= 9
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
-BuildRequires:  spirv-headers >= 1.6.4+sdk303
+BuildRequires:  spirv-headers >= 1.6.4+sdk309
 
 %description
 The package includes an assembler, binary module parser,
@@ -67,15 +70,14 @@ validator, and is used in the standalone tools whilst also enabling
 integration into other code bases directly.
 
 %prep
-%autosetup -p1 -n SPIRV-Tools-2024.4.rc2
+%autosetup -p1 -n SPIRV-Tools-2025.1.rc1
 find . -type f -name CMakeLists.txt -exec \
 	perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt {} +
 
 %build
-%if 0%{?suse_version} && 0%{?suse_version} < 1599
-export CXX=g++-12
-%endif
 %cmake -DSPIRV-Headers_SOURCE_DIR="%_prefix" \
+	-DCMAKE_C_COMPILER="gcc%{?gcc_version:-%{gcc_version}}" \
+	-DCMAKE_CXX_COMPILER="g++%{?gcc_version:-%{gcc_version}}" \
 	-DSPIRV_TOOLS_BUILD_STATIC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON
 %cmake_build
 

_scmsync.obsinfo

@@ -1,4 +0,0 @@
-mtime: 1734379448
-commit: aae3b7f43c6c579079d06523fe5ec101506338f9512020604a4459b40c46044e
-url: https://src.opensuse.org/jengelh/spirv-tools
-revision: master

baselibs.conf

@@ -1,4 +1,4 @@
-libSPIRV-Tools-2024_4_rc2
+libSPIRV-Tools-2025_1_rc1
 spirv-tools-devel
 	requires -spirv-tools-<targettype>
-	requires "libSPIRV-Tools-2024_4_rc2-<targettype> = <version>"
+	requires "libSPIRV-Tools-2025_1_rc1-<targettype> = <version>"