Sync changes to SLFO-1.2 branch

_scmsync.obsinfo

@@ -1,4 +0,0 @@
-mtime: 1735007995
-commit: 6586e89e4f3f1afa01909390a875423418af67dbe95cda059b18c4bcac18176d
-url: https://src.opensuse.org/jengelh/shaderc
-revision: master

build.specials.obscpio

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

shaderc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Mar 13 17:18:36 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Switch Leap build to newer gcc 13
+
+-------------------------------------------------------------------
+Wed Mar 12 17:58:08 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2025.1
+  * Build system updates only
+
 -------------------------------------------------------------------
 Tue Dec 24 02:37:17 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

shaderc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shaderc
 #
-# 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
@@ -18,8 +18,12 @@
 
 # Remember to bump in baselibs.conf
 %define lname libshaderc_shared1
+%if 0%{?suse_version} < 1600
+%define gcc_version 13
+%endif
+
 Name:           shaderc
-Version:        2024.4
+Version:        2025.1
 Release:        0
 Summary:        A collection of tools, libraries and tests for shader compilation
 License:        Apache-2.0
@@ -29,13 +33,14 @@ URL:            https://github.com/google/shaderc
 Source:         https://github.com/google/shaderc/archive/v%version.tar.gz
 Source99:       baselibs.conf
 Patch1:         0001-Use-system-third-party-libs.patch
-BuildRequires:  c++_compiler
 BuildRequires:  cmake >= 2.8.12
+BuildRequires:  gcc%{?gcc_version} >= 9
+BuildRequires:  gcc%{?gcc_version}-c++ >= 9
 BuildRequires:  glslang-devel >= 15.1
 BuildRequires:  glslang-nonstd-devel
 BuildRequires:  python3-base
-BuildRequires:  spirv-headers >= 1.6.4+sdk303
-BuildRequires:  spirv-tools-devel >= 2024.4~rc2
+BuildRequires:  spirv-headers >= 1.6.4+sdk304
+BuildRequires:  spirv-tools-devel >= 2025.1~rc1
 
 %description
 A collection of tools, libraries and tests for shader compilation.
@@ -73,7 +78,9 @@ find . -type f -exec grep -l '#!/usr/bin/env python' {} + | xargs perl -i -lpe '
 
 %build
 export CXXFLAGS="%{optflags} -I%_includedir/External"
-%cmake -DSHADERC_SKIP_TESTS=ON
+%cmake -DSHADERC_SKIP_TESTS=ON \
+	-DCMAKE_C_COMPILER="gcc%{?gcc_version:-%{gcc_version}}" \
+	-DCMAKE_CXX_COMPILER="g++%{?gcc_version:-%{gcc_version}}"
 %cmake_build
 
 %install