shaderc: 2021.3 -> 2022.1

3 files changed, 22 insertions, 21 deletions

diff --git a/shaderc/.signature b/shaderc/.signature
index a7d43e1e7..c4f5eb26b 100644
--- a/shaderc/.signature
+++ b/shaderc/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3904L0g321j0Lqkix0/AIZYru5ByEbiRJJryIu6819e7wpG4zOo0ue2jCPjGPvFO7KS/NUgRqvHqd3mOEgtVzwc=
-SHA256 (Pkgfile) = 828fa621288a7ce3b58d56c87d12421c3f5bf0c8e7ec41c7a2eb256e29b884b3
+RWSagIOpLGJF398lcIRIFFSZHQQNwzLB4jdBdpndG5RhlTv0qu+ImGb2kOAgJxqlh1gmklWJPg9s/IR45E73e9mnoMOVp8XhgQU=
+SHA256 (Pkgfile) = 9a202c6670e0d38e5b141d219db59b969ed621a9954b4392e49079a5a25c61d7
 SHA256 (.footprint) = 768c5796cba31503e5e8a1c1d874f1d8699d410d17d6b98d9a6588ae17462816
-SHA256 (shaderc-v2021.3.tar.gz) = d05f646c363e6447f233126b196238d9022a1dca1bf98f766511aa1a58320972
-SHA256 (SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d.tar.gz) = 848cbb8662ea465d74798541423493eb650098270da21ccf5bf7eadecc0fd42e
-SHA256 (glslc.1) = fc895935c798638d65e5dcca3a5877a4efd03d97ba228c15d3899f2a3f9421fe
+SHA256 (shaderc-v2022.1.tar.gz) = 592c0ba07706a940f95a24073d7f3d050daa0839f24019434a7b2776e5620ace
+SHA256 (glslc.1) = f1bdc5600cea87f3b8088e3304764949fa67df3975be48b76af547d6b30ef859
diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile
index e92b3d100..a6bc76810 100644
--- a/shaderc/Pkgfile
+++ b/shaderc/Pkgfile
@@ -5,18 +5,12 @@
 # Optional: asciidoctor
 
 name=shaderc
-version=2021.3
-## DEPS
-_spirv_headers=f027d53ded7e230e008d37c8b47ede7cd308e19d
+version=2022.1
 release=1
 source=(https://github.com/google/shaderc/archive/v$version/$name-v$version.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz
 	glslc.1)
 
 build() {
-	mkdir -p $name-$version/third_party/spirv-headers
-	mv SPIRV-Headers-$_spirv_headers/* $name-$version/third_party/spirv-headers
-
 	# de-vendor libs and disable git versioning
 	sed '/examples/d;/third_party/d' -i $name-$version/CMakeLists.txt
 	sed '/build-version/d' -i $name-$version/glslc/CMakeLists.txt
@@ -32,12 +26,9 @@ EOF
 		-D CMAKE_INSTALL_PREFIX=/usr \
 		-D CMAKE_INSTALL_LIBDIR=lib \
 		-D CMAKE_BUILD_TYPE=Release \
-		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-		-D CMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,defs" \
+		-D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -ffat-lto-objects" \
 		-D SHADERC_SKIP_TESTS=ON \
-		-D glslang_SOURCE_DIR:PATH='/usr/include/glslang' \
-		-D SPIRV-Headers_SOURCE_DIR:PATH="$SRC/$name-$version/third_party/spirv-headers"
+		-D glslang_SOURCE_DIR:PATH='/usr/include/glslang'
 
 	cmake --build build -j ${JOBS:-1}
 	DESTDIR=$PKG cmake --install build
diff --git a/shaderc/glslc.1 b/shaderc/glslc.1
index 16cb88860..43a271ef9 100644
--- a/shaderc/glslc.1
+++ b/shaderc/glslc.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: glslc Manual
 .\"    Author: [see the "AUTHOR(S)" section]
-.\" Generator: Asciidoctor 2.0.16
-.\"      Date: 2021-08-26
+.\" Generator: Asciidoctor 2.0.17
+.\"      Date: 2022-02-03
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "`GLSLC`" "1" "2021-08-26" "\ \&" "\ \&"
+.TH "`GLSLC`" "1" "2022-02-03" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -546,7 +546,7 @@ the following:
 .RE
 .sp
 Generated code uses SPIR\-V 1.0, except for code compiled for Vulkan 1.1, which uses
-SPIR\-V 1.3, and code compiled for Vulkan 1.5, which uses SPIR\-V 1.5.
+SPIR\-V 1.3, and code compiled for Vulkan 1.2, which uses SPIR\-V 1.5.
 .sp
 If this option is not specified, a default of \f(CRvulkan1.0\fP is used.
 .sp
@@ -626,6 +626,17 @@ The \f(CR<value>\fP can be one of the following:
 .\}
 \f(CRspv1.5\fP
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.  sp -1
+.  IP \(bu 2.3
+.\}
+\f(CRspv1.6\fP
+.RE
 .SS "\f(CR\-x\fP"
 .sp
 \f(CR\-x\fP lets you specify the language of the input shader files. Valid languages