Vulkan/SPIR-V: update to 1.4.357.0; glslang 16.5.0;

srcpkgs/SPIRV-Headers/template

@@ -1,15 +1,15 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
 reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1"
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="MIT"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
 distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${version}.tar.gz"
-checksum=9e6d5c78878172d2b810e97f3a74ecbbb14b4ad52b07384ce915fbbeb226d610
+checksum=4d703067a7e06331ccb37bdfed3f9b7879cc61969a2689ae95c95db34a47ff07
 
 post_install() {
 	vlicense LICENSE

srcpkgs/SPIRV-LLVM-Translator19/template

@@ -1,23 +1,25 @@
 # Template file for 'SPIRV-LLVM-Translator19'
 pkgname=SPIRV-LLVM-Translator19
-version=19.1.18
+version=19.1.22
 revision=1
 _llvm_ver=${version%%.*}
 build_style=cmake
-configure_args="-DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr
- -DClang_DIR=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}/lib/cmake/clang
- -DLLVM_DIR=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}/lib/cmake/llvm
+configure_args="
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}
+ -DCMAKE_SKIP_RPATH=ON
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${XBPS_CROSS_BASE}/usr
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_SPIRV_INCLUDE_TESTS=OFF
 "
-hostmakedepends="clang${_llvm_ver} llvm${_llvm_ver} pkg-config"
+hostmakedepends="pkg-config"
 makedepends="llvm${_llvm_ver}-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules - LLVM ${_llvm_ver}"
+short_desc="LLVM/SPIR-V bi-directional translator - LLVM ${_llvm_ver}"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="NCSA"
 homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
 distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=ce9a4424a6373a274f8df9611aa53e7457a58b56ff36acaa74b946178acaffac
+checksum=2ebdbc79ba02c8cc3e0c1f893231c9181ec1c737ce54ec3c7a25c008354f9219
 
 alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${_llvm_ver}"
 
@@ -27,9 +29,9 @@ post_install() {
 }
 
 SPIRV-LLVM-Translator19-devel_package() {
-	depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
-	conflicts="SPIRV-LLVM-Translator-devel>=0 SPIRV-LLVM-Translator21-devel>=0
-		SPIRV-LLVM-Translator22-devel>=0"
+	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="SPIRV-LLVM-Translator21-devel>=0 SPIRV-LLVM-Translator22-devel>=0
+		SPIRV-LLVM-Translator-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/SPIRV-LLVM-Translator19/update

@@ -1 +1 @@
-pattern="refs/tags/v\K19\.[0-9.]+($|(?=^))"
+pattern="\K19\.[0-9.]+($|(?=^))"

srcpkgs/SPIRV-LLVM-Translator21/template

@@ -1,22 +1,26 @@
 # Template file for 'SPIRV-LLVM-Translator21'
 pkgname=SPIRV-LLVM-Translator21
-version=21.1.7
+version=21.1.11
 revision=1
 _llvm_ver=${version%%.*}
 build_style=cmake
-configure_args="-DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr
+configure_args="
+ -DBUILD_SHARED_LIBS=ON
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}
+ -DCMAKE_SKIP_RPATH=ON
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${XBPS_CROSS_BASE}/usr
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=ON
+ -DLLVM_SPIRV_INCLUDE_TESTS=OFF
 "
-hostmakedepends="clang${_llvm_ver} llvm${_llvm_ver} pkg-config"
+hostmakedepends="pkg-config"
 makedepends="llvm${_llvm_ver}-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules - LLVM ${_llvm_ver}"
+short_desc="LLVM/SPIR-V bi-directional translator - LLVM ${_llvm_ver}"
 maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="NCSA"
 homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
 distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=1a00e06eba69c24ded4ed5708ef3c55ad8786227017271fc335d3cc9abad2def
+checksum=4bf07afc97d655bd235ca4da5ef220a55350e8d4907cc54aae7e40c5dc4cdbe1
 
 alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${_llvm_ver}"
 
@@ -26,7 +30,7 @@ post_install() {
 }
 
 SPIRV-LLVM-Translator21-devel_package() {
-	depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	conflicts="SPIRV-LLVM-Translator19-devel>=0 SPIRV-LLVM-Translator22-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {

srcpkgs/SPIRV-LLVM-Translator21/update

@@ -1 +1 @@
-pattern="refs/tags/v\K21\.[0-9.]+($|(?=^))"
+pattern="\K21\.[0-9.]+($|(?=^))"

srcpkgs/SPIRV-LLVM-Translator22/template

@@ -1,25 +1,26 @@
 # Template file for 'SPIRV-LLVM-Translator22'
 pkgname=SPIRV-LLVM-Translator22
-version=22.1.2
+version=22.1.6
 revision=1
 _llvm_ver=${version%%.*}
 build_style=cmake
 configure_args="
  -DBUILD_SHARED_LIBS=ON
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvm_ver}
  -DCMAKE_SKIP_RPATH=ON
- -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${XBPS_CROSS_BASE}/usr
  -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=ON
  -DLLVM_SPIRV_INCLUDE_TESTS=OFF
 "
-hostmakedepends="clang${_llvm_ver} llvm${_llvm_ver} pkg-config"
+hostmakedepends="pkg-config"
 makedepends="llvm${_llvm_ver}-devel SPIRV-Headers SPIRV-Tools-devel"
-short_desc="API and commands for processing SPIR-V modules - LLVM ${_llvm_ver}"
+short_desc="LLVM/SPIR-V bi-directional translator - LLVM ${_llvm_ver}"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="NCSA"
 homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
 distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=b37196b1a1a60282a24cf937ab7d6807d7d54dc718f2a37a78e211be26df57ac
+checksum=8ddafd91be7e8028dd79472e91b6ea981c63131d4c7047a7f51457638a04cadc
 
 alternatives="llvm-spirv:llvm-spirv:/usr/bin/llvm-spirv-${_llvm_ver}"
 
@@ -29,9 +30,9 @@ post_install() {
 }
 
 SPIRV-LLVM-Translator22-devel_package() {
-	depends="SPIRV-LLVM-Translator${_llvm_ver}-${version}_${revision}"
-	conflicts="SPIRV-LLVM-Translator-devel>=0 SPIRV-LLVM-Translator21-devel>=0
-		SPIRV-LLVM-Translator19-devel>=0"
+	depends="${sourcepkg}>=${version}_${revision}"
+	conflicts="SPIRV-LLVM-Translator19-devel>=0 SPIRV-LLVM-Translator21-devel>=0
+		SPIRV-LLVM-Translator-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/SPIRV-LLVM-Translator22/update

@@ -1 +1 @@
-pattern="refs/tags/v\K22\.[0-9.]+($|(?=^))"
+pattern="\K22\.[0-9.]+($|(?=^))"

srcpkgs/SPIRV-Tools/template

@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2026.2
+version=2026.3
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/v${version}.tar.gz"
-checksum=b4390652e64ab188eede9d556cf183b3c1c4be44d4fcd104b0d4af3bea2712d1
+checksum=fff0667b25dfb98177da3cc4cc61ac277d076786df42baaf8d9635a25bdf9226
 LDFLAGS="-Wl,--no-undefined"
 
 SPIRV-Tools-devel_package() {

srcpkgs/Vulkan-Headers/template

@@ -1,11 +1,15 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
 short_desc="Vulkan header files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
+license="Apache-2.0 OR MIT"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/vulkan-sdk-${version}.tar.gz"
-checksum=6d1bb65e49520344cc0a48af3dc02e993781efff14c7ebdcb8ae9fa23ddf7e83
+checksum=e87dce08116151f6b6d7de6b6faf41498e87e6cf848ff16fa3bd5402190ad4a3
+
+post_install() {
+	vlicense LICENSE.md
+}

srcpkgs/Vulkan-Tools/template

@@ -1,17 +1,15 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
-configure_args="-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DWAYLAND_SCANNER_EXECUTABLE=/usr/bin/wayland-scanner"
-hostmakedepends="python3 pkg-config glslang wayland-devel"
-makedepends="vulkan-loader-devel libxcb-devel libXrandr-devel
- wayland-devel wayland-protocols"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="Vulkan-Headers vulkan-loader-devel libX11-devel libxcb-devel
+ libXrandr-devel wayland-devel wayland-protocols"
 depends="vulkan-loader"
 short_desc="Official Vulkan tools and utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/vulkan-sdk-${version}.tar.gz"
-checksum=502b53a585f49036e45372724f652bacc1fad2c62396e321bc8f5fbc031c14d5
+checksum=6c94b86c850808aba316d999dd6742133d6197ae2135248d3a8aed9b32ebd1f7

srcpkgs/Vulkan-Utility-Libraries/template

@@ -1,15 +1,13 @@
 # Template file for 'Vulkan-Utility-Libraries'
 pkgname=Vulkan-Utility-Libraries
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
-configure_args="-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers"
 depends="Vulkan-Headers"
 short_desc="Khronos official Vulkan utility libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-${version}.tar.gz"
-checksum=e8eca1be31a658c9d0ca30951f2fc7912e4bb01502da64f8decdc71836241a6c
+checksum=6d450436aea4a821d7b0d8bb914c2e375088d98eeeaad0fbf059fdb06ac937f4

srcpkgs/Vulkan-ValidationLayers/template

@@ -1,19 +1,15 @@
 # Template file for 'Vulkan-ValidationLayers'
 pkgname=Vulkan-ValidationLayers
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
-configure_args="
- -DUPDATE_DEPS=OFF
- -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DVULKAN_UTILITY_LIBRARIES_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr"
+configure_args="-DUPDATE_DEPS=OFF"
 hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers Vulkan-Utility-Libraries SPIRV-Headers SPIRV-Tools-devel
- libXrandr-devel wayland-devel"
+ libX11-devel libxcb-devel libXrandr-devel wayland-devel"
 short_desc="Khronos official Vulkan validation layers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-${version}.tar.gz"
-checksum=a299313781987946b6b26553d9f3da34126ebaea6e1bf805beb402d510d3b300
+checksum=73180b11992a3554e97ebc18e6bf2b45ff9790ded9d87fc526c7bab865d1303f

srcpkgs/glslang/template

@@ -1,37 +1,44 @@
 # Template file for 'glslang'
-# Libraries are unversioned, beware of ABI breakage (rebuild shaderc on updates)
+# Rebuild shaderc on SONAME changes
 pkgname=glslang
-version=16.3.0
+version=16.5.0
 revision=1
 build_style=cmake
-hostmakedepends="python3 bison gtest-devel"
+hostmakedepends="python3"
 makedepends="SPIRV-Tools-devel"
 short_desc="Khronos reference front-end for GLSL, ESSL, and sample SPIR-V generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
+license="Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND AML-glslang"
 homepage="https://github.com/KhronosGroup/glslang"
 distfiles="https://github.com/KhronosGroup/glslang/archive/${version}.tar.gz"
-checksum=efff5a15258dce1ca2d323bf64c974f5fca03778174615dbc30c8d36db645bf5
+checksum=01af17195fbeb59e39e31e9506de35bb39dfd35807ea0c9a1a99d7d1183ddd45
+
+CFLAGS="-DNDEBUG"
+CXXFLAGS="-DNDEBUG"
+
+# musl sizes pthread stacks from PT_GNU_STACK; glslang's 16 workers need more
+LDFLAGS="-Wl,-z,stack-size=2097152"
 
 if [ "$CROSS_BUILD" ]; then
-	export cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	cmake_crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 fi
 
 do_configure() {
 	cmake -B build-shared -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr \
+		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_EXTERNAL=OFF \
 		-DBUILD_SHARED_LIBS=ON \
 		-DALLOW_EXTERNAL_SPIRV_TOOLS=YES \
 		$cmake_crossopts
 
-
 	cmake -B build-static -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr \
+		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_EXTERNAL=OFF \
 		-DBUILD_SHARED_LIBS=OFF \
 		-DALLOW_EXTERNAL_SPIRV_TOOLS=YES \
@@ -53,12 +60,11 @@ pre_check() {
 }
 
 post_install() {
-	sed -n '2,32p' < glslang/GenericCodeGen/CodeGen.cpp > LICENSE
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }
 
 glslang-devel_package() {
-	depends="glslang-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/shaderc/template

@@ -1,29 +1,28 @@
 # Template file for 'shaderc'
 pkgname=shaderc
-version=2026.2
+version=2026.3
 revision=1
 build_style=cmake
-configure_args="-DSHADERC_SKIP_TESTS=ON"
+configure_args="-DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON
+ -DSHADERC_SKIP_COPYRIGHT_CHECK=ON"
 hostmakedepends="python3"
 makedepends="SPIRV-Tools-devel glslang-devel SPIRV-Headers"
 short_desc="Collection of tools, libraries and tests for shader compilation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/shaderc"
 distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
-checksum=f924178e75e3293082481b25ed64d5e48a795b479dac3bd3c83d23070855df42
+checksum=ee493ccf1b3038b4ef2fe024664c5eb2dc4bcc1f6b05b33e3909de0e19c81024
 
 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang"
 LDFLAGS="-Wl,--no-undefined"
 
 pre_configure() {
 	# Unbundle glslang, SPIRV-Headers, SPIRV-Tools
-	# also remove examples
-	sed -i -e '/add_subdirectory(third_party)/d' \
-		   -e '/add_subdirectory(examples)/d' CMakeLists.txt
+	vsed -i CMakeLists.txt -e '/add_subdirectory(third_party)/d'
 
 	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt
+	vsed -i glslc/CMakeLists.txt -e '/build-version/d'
 
 	# Create our own build-version.inc since we disabled git versioning
 	# need to keep this in sync with glslang and SPIRV-Tools versions

srcpkgs/vulkan-loader/template

@@ -1,18 +1,17 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
-version=1.4.350.1
+version=1.4.357.0
 revision=1
 build_style=cmake
-configure_args="-DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DBUILD_TESTS=OFF"
+configure_args="-DBUILD_TESTS=OFF"
 hostmakedepends="python3 pkg-config"
-makedepends="Vulkan-Headers libxcb-devel libXrandr-devel wayland-devel"
+makedepends="Vulkan-Headers libX11-devel libxcb-devel libXrandr-devel wayland-devel"
 short_desc="Vulkan Installable Client Driver (ICD) loader"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
 distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/vulkan-sdk-${version}.tar.gz"
-checksum=602984a71000981e25e4feb419e6cdd70b18ffe2b8004f60f591706027bca468
+checksum=54f2537df22313768da0317dda2abdaaab7711b4081c48c869a79db343d0ae70
 
 vulkan-loader-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} Vulkan-Headers"