Sync changes to SLFO-1.2 branch

- Fix building vsgXChange and other packages by adding the
  missing runtime dependency to the development package
  for SPIRV-Tools-opt

OBS-URL: https://build.opensuse.org/request/show/1234527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glslang?expand=0&rev=55

_scmsync.obsinfo

@@ -1,4 +0,0 @@
-mtime: 1720604356
-commit: b2956866ab6dba106a71b552f99eb95238d9d897bd212f81c8c5f7cdd9add3c3
-url: https://src.opensuse.org/jengelh/glslang
-revision: master

baselibs.conf

@@ -1 +1 @@
-libglslang14
+libglslang15

build.specials.obscpio

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

glslang.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Thu Mar 13 16:47:27 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 15.2
+  * Emit error if using in/out with struct pointer
+  * Emit SPV_EXT_opacity_micromap if GL extension is present
+  * Support GL_NV_linear_swept_spheres, GLSL_EXT_nontemporal_keyword,
+    GL_NV_cluster_acceleration_structure, GL_NV_cooperative_vector,
+    GL_EXT_texture_offset_non_const, EXT_integer_dot_product
+  * Check SparseTextureOffset non-const parameters
+  * Revert cross-stage check for missing outputs
+  * Add support for OpTypeRayQueryKHR and
+    OpTypeAccelerationStructureKHR to SPVRemapper
+- Make build recipe POSIX sh compatible
+- Switch Leap compiler to gcc 13 following the rest of the
+  Vulkan stack
+
+-------------------------------------------------------------------
+Thu Jan  2 08:54:06 UTC 2025 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Fix building vsgXChange and other packages by adding the
+  missing runtime dependency to the development package
+  for SPIRV-Tools-opt
+
+-------------------------------------------------------------------
+Sun Dec 15 21:51:35 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 15.1
+  * Add Vulkan 1.4 target and client
+  * Implement GLSL_NV_cooperative_matrix2
+  * Emit OpModfStruct instead of depracated OpModf
+
+-------------------------------------------------------------------
+Thu Sep 26 19:29:05 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 15
+  * Add setResourceSetBinding method to the API
+  * Add interface to get the GLSL IO mapper and resolver
+  * Allow compute derivative modes when the workgroup dimensions
+    are spec constants
+  * Merge ancillary libraries into main glslang library and stub
+    originals
+  * Add public setSourceFile and addSourceText methods to TShader
+    class
+  * Add types and functions for IO mapping to API
+  * Add function to set preprocessed code to API
+  * Add set/get version functions to API
+
 -------------------------------------------------------------------
 Wed Jun 26 00:22:03 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

glslang.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glslang
 #
-# 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
@@ -16,27 +16,30 @@
 #
 
 
-%define lname libglslang14
+%define lname libglslang15
+%if 0%{?suse_version} < 1600
+%define gcc_version 13
+%endif
+
 Name:           glslang
-Version:        14.3.0
+Version:        15.2.0
 Release:        0
 Summary:        OpenGL and OpenGL ES shader front end and validator
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 URL:            https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 #Git-URL:	https://github.com/KhronosGroup/glslang
-Source:         https://github.com/KhronosGroup/glslang/archive/refs/tags/%version.tar.gz
+# tag 15.2.0 missing in git as of 2025-03-13
+%define rev 0018771b46c492e28ca916b00eda96093381a3b2
+Source:         https://github.com/KhronosGroup/glslang/archive/%rev.tar.gz
 Source3:        baselibs.conf
 BuildRequires:  bison
 BuildRequires:  cmake >= 3.14.0
 BuildRequires:  fdupes
+BuildRequires:  gcc%{?gcc_version} >= 9
+BuildRequires:  gcc%{?gcc_version}-c++ >= 9
 BuildRequires:  python3-base
-BuildRequires:  spirv-tools-devel >= 2024.3
-%if 0%{?suse_version} && 0%{?suse_version} < 1599
-BuildRequires:  gcc11-c++
-%else
-BuildRequires:  c++_compiler
-%endif
+BuildRequires:  spirv-tools-devel >= 2025.1~rc1
 
 %description
 glslang is a compiler front end for the OpenGL ES and OpenGL shading
@@ -55,6 +58,7 @@ specifications for these languages.
 %package devel
 Summary:        OpenGL and OpenGL ES shader front end and validator
 Group:          Development/Libraries/C and C++
+Requires:       cmake(SPIRV-Tools-opt)
 Requires:       %lname = %version
 
 %description devel
@@ -85,17 +89,17 @@ This package contains additional headers that are not officially installed,
 but which some downstream packages rely on.
 
 %prep
-%autosetup -p1
+%autosetup -n glslang-%rev -p1
 
 %build
 %global _lto_cflags %{?_lto_cflags} -ffat-lto-objects
-# ABI keeps on breaking (gh#3052 #3311 #3312 #3593)
-echo "V_%version { global: *; };" >/tmp/z.sym
-%if 0%{?suse_version} && 0%{?suse_version} < 1599
-export CC=gcc-11 CXX=g++-11
-%endif
+# (gh#3052 #3311 #3312 #3593) -- supposedly handled better in
+# glslang-15 and onwards, do watch for ABI breaks
+#echo "V_%version { global: *; };" >/tmp/z.sym
 # Trim -Wl,--no-undefined for now (https://github.com/KhronosGroup/glslang/issues/1484)
 %cmake -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
+	-DCMAKE_C_COMPILER="gcc%{?gcc_version:-%{gcc_version}}" \
+	-DCMAKE_CXX_COMPILER="g++%{?gcc_version:-%{gcc_version}}" \
 	-DALLOW_EXTERNAL_SPIRV_TOOLS:BOOL=ON -DENABLE_OPT:BOOL=ON
 %make_build
 
@@ -105,12 +109,12 @@ od="$PWD"
 %cmake_install
 
 b="%buildroot"
-pushd "$b"
+cd "$b"
 (
 	find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n"
 	find usr/include "(" -type f -o -type l ")" -printf "/%p\n"
 ) | sort >"$od/devel.files"
-popd
+cd -
 
 mkdir -p "$b/%_includedir/External/"
 cp -a glslang "$b/%_includedir/"
@@ -118,12 +122,12 @@ cp -a SPIRV StandAlone "$b/%_includedir/External/"
 find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete
 find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"
 
-pushd "$b"
+cd "$b"
 (
 	find usr/include -mindepth 1 -type d -printf "%%%%dir /%p\n"
 	find usr/include "(" -type f -o -type l ")" -printf "/%p\n"
 ) | sort >"$od/devel_full.files"
-popd
+cd -
 comm -13 "$od/devel.files" "$od/devel_full.files" >"$od/devel2.files"
 
 # 3rd party programs use -lOSDependent (because pristine glslang shipped .a
@@ -141,11 +145,10 @@ done
 
 %fdupes %buildroot/%_prefix
 
-%post   -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%ldconfig_scriptlets -n %lname
 
 %files -n %lname
-%_libdir/*.so.14*
+%_libdir/*.so.15*
 
 %files devel -f devel.files
 %_bindir/gls*