Index: head/graphics/spirv-tools/Makefile
===================================================================
--- head/graphics/spirv-tools/Makefile	(revision 565492)
+++ head/graphics/spirv-tools/Makefile	(revision 565493)
@@ -1,25 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2020.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	1bd539b9bfc4.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4116
+PATCHFILES+=	10d4e2792d95.patch:-p1 # https://github.com/KhronosGroup/SPIRV-Tools/pull/4128
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tools for processing SPIR-V intermediate shader language modules
 
 LICENSE=	APACHE20
 
 USES=		cmake compiler:c++11-lib python:3.4+,build shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	tools/lesspipe/spirv-lesspipe.sh
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-Tools
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-29-g75b30a6:headers/external/spirv-headers
 
 CMAKE_ON=	SPIRV_SKIP_TESTS
 CMAKE_OFF=	SPIRV_WERROR
 
 .include <bsd.port.mk>
Index: head/graphics/spirv-tools/distinfo
===================================================================
--- head/graphics/spirv-tools/distinfo	(revision 565492)
+++ head/graphics/spirv-tools/distinfo	(revision 565493)
@@ -1,5 +1,9 @@
 TIMESTAMP = 1607357641
 SHA256 (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
 SIZE (KhronosGroup-SPIRV-Tools-v2020.6_GH0.tar.gz) = 2595300
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed_GH0.tar.gz) = 395500
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 03075fc9f52833849bb34210029d029669f96bfc9dcf937b910a8ba7f5f361db
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 403781
+SHA256 (1bd539b9bfc4.patch) = 3f6444e55df601b147311c04760831a7d09a7361be2ad4332a8977e8727df58c
+SIZE (1bd539b9bfc4.patch) = 4014
+SHA256 (10d4e2792d95.patch) = e6ca100fb75a7e2e6afc79d0ed2b16e7340189095c7f3b7fe6f7bf1b2cfcae68
+SIZE (10d4e2792d95.patch) = 47196
Index: head/graphics/vulkan-validation-layers/Makefile
===================================================================
--- head/graphics/vulkan-validation-layers/Makefile	(revision 565492)
+++ head/graphics/vulkan-validation-layers/Makefile	(revision 565493)
@@ -1,44 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.169
+DISTVERSION=	1.2.170
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Validation layers for the Vulkan graphics API
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	glslang>0:graphics/glslang \
 		spirv-tools>0:graphics/spirv-tools \
 		vulkan-headers>0:graphics/vulkan-headers
 
 USES=		cmake compiler:c++11-lib pkgconfig python:3.4+,build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-22-gfaa570a:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-29-g75b30a6:headers/external/spirv-headers
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" \
 		-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
 
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_CMAKE_BOOL=	BUILD_WSI_WAYLAND_SUPPORT
 
 XCB_DESC=		${X11_DESC} via libxcb
 XCB_USES=		xorg
 XCB_USE=		XORG=xcb
 XCB_CMAKE_BOOL=		BUILD_WSI_XCB_SUPPORT
 
 XLIB_DESC=		${X11_DESC} via libX11
 XLIB_USES=		xorg
 XLIB_USE=		XORG=x11,xrandr
 XLIB_CMAKE_BOOL=	BUILD_WSI_XLIB_SUPPORT
 
 .include <bsd.port.mk>
Index: head/graphics/vulkan-validation-layers/distinfo
===================================================================
--- head/graphics/vulkan-validation-layers/distinfo	(revision 565492)
+++ head/graphics/vulkan-validation-layers/distinfo	(revision 565493)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1612803845
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.169_GH0.tar.gz) = 680a18ba4391db06372059ed09e4b699db42ea8e0a8aaabbaafcc6647e65664d
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.169_GH0.tar.gz) = 2539211
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-22-gfaa570a_GH0.tar.gz) = 6a7622faff079a223aad7fddaa10b537bbdd01d951bd4963687e2869c347a40c
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-22-gfaa570a_GH0.tar.gz) = 402934
+TIMESTAMP = 1613492249
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.170_GH0.tar.gz) = cc9f8b5b98cf2f1667cbce248ce486980e7cd82d5ab50a6481dd3734222f047f
+SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.170_GH0.tar.gz) = 2581751
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 03075fc9f52833849bb34210029d029669f96bfc9dcf937b910a8ba7f5f361db
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-29-g75b30a6_GH0.tar.gz) = 403781