glslang: 11.2.0 -> 11.4.0

4 files changed, 54 insertions, 16 deletions

diff --git a/glslang/.footprint b/glslang/.footprint
index d4c09f8f1..1953d5fcf 100644
--- a/glslang/.footprint
+++ b/glslang/.footprint
@@ -98,8 +98,9 @@ drwxr-xr-x	root/root	usr/lib/cmake/
 -rwxr-xr-x	root/root	usr/lib/libSPIRV.so
 -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.2.0
--rwxr-xr-x	root/root	usr/lib/libglslang.so.11.2.0
+lrwxrwxrwx	root/root	usr/lib/libglslang.so.11 -> libglslang.so.11.4.0
+-rwxr-xr-x	root/root	usr/lib/libglslang.so.11.4.0
diff --git a/glslang/.signature b/glslang/.signature
index 1c33044e3..2d94a80f3 100644
--- a/glslang/.signature
+++ b/glslang/.signature
@@ -1,7 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dyYmoLlJ5c2jVeVSiOdHhoa/oPUBLKZTEEMnOGa2B2PCXzcdi+yxAPQH/gQTbTk7Vb7UQMPaNin1Le5/WBePgg=
-SHA256 (Pkgfile) = ccff2f940eaf571c5ba4466fc8628918573ee6f4073d3b3f3d5c698f0fb0bbb3
-SHA256 (.footprint) = d566785862aeba547a4c05530dd2a929b5eefd73f4a9a0df99f815d88314659a
-SHA256 (glslang-11.2.0.tar.gz) = 8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06
-SHA256 (glslang-75b30a659c8a4979104986652c54cc421fc51129.tar.gz) = 60a5845bcd0ee30e000151bb725b461f67f95d703294ef74c034ff3a3e039324
-SHA256 (glslang-c79edd260c2b503f0eca57310057b4a100999cc5.tar.gz) = bfa4c1a3e6334b8760d3f8e0c6f01d5f436b19f1cb119f53c28b7a1ed165a575
+RWSE3ohX2g5d/Vn0MdtwTEm3tVjlg6RTB9WKQPKZ35AkN4Lo+XzYPb5wAe8Hn/yJQOvGP4G7jznC0fXzl2re1By9sSDfJFNfqgQ=
+SHA256 (Pkgfile) = 5e91b20c6b52608083516eb745fdbc738e87d838d5234a90de6d9c3010b89b0c
+SHA256 (.footprint) = 9f3beb08cb216049cac1d10d50de93f905fb068055e9649969553ebec73f36a5
+SHA256 (glslang-11.4.0.tar.gz) = 9bae79c2b640b60474f8944a5ab4aff3af990074636ea2a0a3c97cb86be61dfa
+SHA256 (SPIRV-Headers-dafead1765f6c1a5f9f8a76387dcb2abe4e54acd.tar.gz) = e1c8530c95fc8c70fa6a7cbc269ebd1b10da3872efa0e3c6eb82452c3e180cda
+SHA256 (SPIRV-Tools-dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07.tar.gz) = d9766d716e36e1524fe53cfb60fb174d75f6ca1f093a32c712f192d293d45b9d
+SHA256 (known_good.py.in) = 3c9fdb7a6a0bdaf3790348193a6100814b879d02b2e4d4e89dc6fa95bafacdab
diff --git a/glslang/Pkgfile b/glslang/Pkgfile
index 972baae31..57ffbc5e6 100644
--- a/glslang/Pkgfile
+++ b/glslang/Pkgfile
@@ -5,22 +5,27 @@
 # Optional: ninja
 
 name=glslang
-version=11.2.0
+version=11.4.0
 release=1
-_commit=c594de23cdd790d64ad5f9c8b059baae0ee2941d
-_spirv_headers=75b30a659c8a4979104986652c54cc421fc51129
-_spirv_tools=c79edd260c2b503f0eca57310057b4a100999cc5
+_spirv_headers=dafead1765f6c1a5f9f8a76387dcb2abe4e54acd
+_spirv_tools=dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07
 source=(https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/$name-$_spirv_headers.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Tools/archive/$_spirv_tools/$name-$_spirv_tools.tar.gz)
+	https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Tools/archive/$_spirv_tools/SPIRV-Tools-$_spirv_tools.tar.gz
+	known_good.py.in)
 
 build() {
 	cp -r SPIRV-Tools-$_spirv_tools $name-$version/External/spirv-tools
 	cp -r SPIRV-Headers-$_spirv_headers $name-$version/External/spirv-tools/external/spirv-headers
 
+	sed -e "s|@SRC@|$SRC/$name-$version|" $SRC/known_good.py.in > $SRC/known_good.py
+	chmod u+x $SRC/known_good.py
+	$SRC/known_good.py
+
 	prt-get isinst ninja && PKGMK_GLSLANG+=' -G Ninja'
-	prt-get isinst ccache && PKGMK_GLSLANG+=' -D USE_CCACHE=ON'
-	prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
+	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="
 		-S $name-$version
diff --git a/glslang/known_good.py.in b/glslang/known_good.py.in
new file mode 100755
index 000000000..74cbc2306
--- /dev/null
+++ b/glslang/known_good.py.in
@@ -0,0 +1,31 @@
+#!/usr/bin/python3
+#
+#  known_good.py.in
+#
+#  Copyright (c) 2021 Danny Rawlins (https://crux.ster.zone)
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#  USA.
+#
+
+import json
+
+with open('@SRC@/known_good.json', 'r') as myfile:
+    data=myfile.read()
+
+obj = json.loads(data)
+
+print (str(obj['commits'][0]['name']) + ': ' + str(obj['commits'][0]['commit']))
+print (str(obj['commits'][1]['name']) + ': ' + str(obj['commits'][1]['commit']))