glslang: update to 11.12.0

3 files changed, 16 insertions, 37 deletions

diff --git a/glslang/.footprint b/glslang/.footprint
index 0356c071e..e307c4d04 100644
--- a/glslang/.footprint
+++ b/glslang/.footprint
@@ -59,6 +59,7 @@ drwxr-xr-x	root/root	usr/include/glslang/SPIRV/
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/GlslangToSpv.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/Logger.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/NonSemanticDebugPrintf.h
+-rw-r--r--	root/root	usr/include/glslang/SPIRV/NonSemanticShaderDebugInfo100.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SPVRemapper.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SpvBuilder.h
 -rw-r--r--	root/root	usr/include/glslang/SPIRV/SpvTools.h
@@ -71,23 +72,19 @@ drwxr-xr-x	root/root	usr/include/glslang/SPIRV/
 -rw-r--r--	root/root	usr/include/glslang/build_info.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cmake/
--rw-r--r--	root/root	usr/lib/cmake/HLSLTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/HLSLTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/OGLCompilerTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/OGLCompilerTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/OSDependentTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/OSDependentTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/SPIRVTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/SPIRVTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/SPVRemapperTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/SPVRemapperTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/glslang-default-resource-limitsTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/glslang-default-resource-limitsTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/glslangTargets-release.cmake
+drwxr-xr-x	root/root	usr/lib/cmake/glslang/
+-rw-r--r--	root/root	usr/lib/cmake/glslang/glslang-config-version.cmake
+-rw-r--r--	root/root	usr/lib/cmake/glslang/glslang-config.cmake
+-rw-r--r--	root/root	usr/lib/cmake/glslang/glslang-targets-release.cmake
+-rw-r--r--	root/root	usr/lib/cmake/glslang/glslang-targets.cmake
 -rw-r--r--	root/root	usr/lib/cmake/glslangTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/glslangValidatorTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/glslangValidatorTargets.cmake
--rw-r--r--	root/root	usr/lib/cmake/spirv-remapTargets-release.cmake
 -rw-r--r--	root/root	usr/lib/cmake/spirv-remapTargets.cmake
 -rw-r--r--	root/root	usr/lib/libGenericCodeGen.a
 -rw-r--r--	root/root	usr/lib/libHLSL.a
@@ -100,10 +97,8 @@ drwxr-xr-x	root/root	usr/lib/cmake/
 -rw-r--r--	root/root	usr/lib/libSPVRemapper.a
 -rwxr-xr-x	root/root	usr/lib/libSPVRemapper.so
 -rw-r--r--	root/root	usr/lib/libglslang-default-resource-limits.a
+-rwxr-xr-x	root/root	usr/lib/libglslang-default-resource-limits.so
 -rw-r--r--	root/root	usr/lib/libglslang.a
 lrwxrwxrwx	root/root	usr/lib/libglslang.so -> libglslang.so.11
-lrwxrwxrwx	root/root	usr/lib/libglslang.so.11 -> libglslang.so.11.10.0
--rwxr-xr-x	root/root	usr/lib/libglslang.so.11.10.0
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/glslang.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/spirv.pc
+lrwxrwxrwx	root/root	usr/lib/libglslang.so.11 -> libglslang.so.11.12.0
+-rwxr-xr-x	root/root	usr/lib/libglslang.so.11.12.0
diff --git a/glslang/.signature b/glslang/.signature
index e898e8e38..6eed7b589 100644
--- a/glslang/.signature
+++ b/glslang/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Qu2Wwbo6Jc/yZ/j+HFFM3c2slIZonOvCKd4vacwlaaXKL75Q5LLwWbNfPRCHumro6B8wSVIRjv5MAokqCRtZgM=
-SHA256 (Pkgfile) = 661daa4b79bbf8945d57321b5a809859a5bb5d4a768dbb9ff08c67ad9c775112
-SHA256 (.footprint) = 31296b70a17e7cc4a15d78c9d41bff36a6ea8d5b81bb248696bbe1b6d1d0ac67
-SHA256 (glslang-11.10.0.tar.gz) = 8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602
-SHA256 (glslang-default-resource-limits_staticlib.patch) = 37fd2a024abc723c456c872a2ceb3d025ac1bf1267ce3539a0db2dc1e4803bd4
-SHA256 (0001-pkg-config-compatibility.patch) = 0867569b441b98012d5f3c13e744a693228e6550ec120a4da53a749138867105
+RWSE3ohX2g5d/bdW/OvXlAGuTbPosZ2wfJ1uFBUyVny7SFEb4OEBtZM4FYoHfr4RopcHcRfh713f0hN8T9ZSBmJDzMW9TykCQgM=
+SHA256 (Pkgfile) = 9325917dc328a7a64e0ca2b05eeb8daf55e5742677aa20a0522d5fd39b278dcb
+SHA256 (.footprint) = 1e946c71805269a7453796564de74caf1d8d10d9fa5e10e9fe2702b04089b482
+SHA256 (glslang-11.12.0.tar.gz) = 7795a97450fecd9779f3d821858fbc2d1a3bf1dd602617d95b685ccbcabc302f
diff --git a/glslang/Pkgfile b/glslang/Pkgfile
index ec945563f..8d90883c2 100644
--- a/glslang/Pkgfile
+++ b/glslang/Pkgfile
@@ -2,29 +2,16 @@
 # URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: spirv-tools
-# Optional: ninja
 
 name=glslang
-version=11.10.0
+version=11.12.0
 release=1
-source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
-	glslang-default-resource-limits_staticlib.patch
-	0001-pkg-config-compatibility.patch)
+source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz)
 
 build() {
-	patch -d $name-$version -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch
-
-	# https://patch-diff.githubusercontent.com/raw/KhronosGroup/glslang/pull/1722.patch#/0001-pkg-config-compatibility.patch
-	patch -d $name-$version -p1 -i $SRC/0001-pkg-config-compatibility.patch
-
-	find $SRC -name '*.h' -or -name '*.cpp' -or -name '*.hpp'| xargs chmod a-x
-
-	prt-get isinst ninja && PKGMK_GLSLANG+=' -G Ninja'
-	prt-get isinst ccache && \
-		PKGMK_GLSLANG+=' -D USE_CCACHE=ON' && \
-		PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
 
 	local config="
+		-G Ninja
 		-S $name-$version
 		-D CMAKE_INSTALL_PREFIX=/usr
 		-D CMAKE_INSTALL_LIBDIR=lib
@@ -37,7 +24,6 @@ build() {
 		-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects"
 	cmake --build build-static
 
-	# https://github.com/KhronosGroup/glslang/issues/1484 -Wl,--no-undefined
 	cmake -B build-shared $config $PKGMK_GLSLANG \
 		-D BUILD_SHARED_LIBS=ON \
 		-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \