diff --git a/graphics/glslang/Makefile b/graphics/glslang/Makefile
index 75bf1aeddd3e..59a40cea5629 100644
--- a/graphics/glslang/Makefile
+++ b/graphics/glslang/Makefile
@@ -1,17 +1,21 @@
 PORTNAME=	glslang
 DISTVERSION=	11.11.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	228c67228a18.patch:-p1 # https://github.com/KhronosGroup/glslang/pull/3014
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	OpenGL and OpenGL ES shader front end and validator
 WWW=		https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 
 LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE GPLv3+ MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake:testing compiler:c++11-lib python:3.4+,build
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 
 .include <bsd.port.mk>
diff --git a/graphics/glslang/distinfo b/graphics/glslang/distinfo
index 9f793ffcff79..71f609463c75 100644
--- a/graphics/glslang/distinfo
+++ b/graphics/glslang/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1660318330
 SHA256 (KhronosGroup-glslang-11.11.0_GH0.tar.gz) = 26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438
 SIZE (KhronosGroup-glslang-11.11.0_GH0.tar.gz) = 3542123
+SHA256 (228c67228a18.patch) = be6a605c2ea0c88b7f42f224ba193b548ae72a5ec9bcda97031e4dee50306b43
+SIZE (228c67228a18.patch) = 1127974
diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
index 3e5c4fe8b808..3bc5edb5bd62 100644
--- a/graphics/shaderc/Makefile
+++ b/graphics/shaderc/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	shaderc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.2
+DISTVERSION=	2022.3
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GLSL/HLSL to SPIR-V shader compiler
 WWW=		https://github.com/google/shaderc
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslang>0:graphics/glslang \
 		spirv-tools>0:graphics/spirv-tools
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake:testing compiler:c++11-lib localbase:ldflags python:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	google
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-173-g0bcc624:headers/third_party/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-187-g85a1ed2:headers/third_party/spirv-headers
 CMAKE_ON+=	${CMAKE_TESTING_OFF}
 CMAKE_TESTING_OFF=	SHADERC_SKIP_TESTS
 CMAKE_ARGS=	-Dglslang_SOURCE_DIR:PATH="${LOCALBASE}/include/glslang" \
 		-DSPIRV-Headers_SOURCE_DIR:PATH="${WRKSRC}/third_party/spirv-headers"
 LDFLAGS+=	-Wl,-z,defs # glslang
 
 post-patch:
 # Disable bundled dependencies
 	${REINPLACE_CMD} '/third_party/d' ${WRKSRC}/CMakeLists.txt
 # Unbreak tests with system spirv-tools
 	${REINPLACE_CMD} 's,\$$<TARGET_FILE:\(spirv-dis\)>,\1,' \
 		${WRKSRC}/glslc/test/CMakeLists.txt
 
 pre-configure:
 # Extract (snapshot) version from the port instead of CHANGES + .git/
 	${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt
 	${ECHO_CMD} "\"${PORTNAME} ${DISTVERSIONFULL}\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n v%v' spirv-tools`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 	${ECHO_CMD} "\"`${PKG_BIN} query '%n %v' glslang`\n\"" >> ${WRKSRC}/glslc/src/build-version.inc
 
 .include <bsd.port.mk>
diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo
index 68fc1c10ad5f..19b21e14c4a2 100644
--- a/graphics/shaderc/distinfo
+++ b/graphics/shaderc/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1660417957
-SHA256 (google-shaderc-v2022.2_GH0.tar.gz) = 517d36937c406858164673db696dc1d9c7be7ef0960fbf2965bfef768f46b8c0
-SIZE (google-shaderc-v2022.2_GH0.tar.gz) = 223386
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-173-g0bcc624_GH0.tar.gz) = 964d4a97323c5483ed0636fae599955fac4f178c576f1734331bc297ff2e39dc
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-173-g0bcc624_GH0.tar.gz) = 437674
+TIMESTAMP = 1665599034
+SHA256 (google-shaderc-v2022.3_GH0.tar.gz) = c1dee49535cfdf86994990b21fe129a74bb0d628a647f4aae8905bd61df32607
+SIZE (google-shaderc-v2022.3_GH0.tar.gz) = 223478
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-187-g85a1ed2_GH0.tar.gz) = 2a8b49657434cbb96c20e0c1558a70d32fc8eadf80e1d611c73ff721fb3d8212
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-187-g85a1ed2_GH0.tar.gz) = 440065