--- devel/spirv-tools/Makefile	(revision 556228)
+++ devel/spirv-tools/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	spirv-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2020.2
+DISTVERSION=	2020.4
 CATEGORIES=	devel graphics
 
 MAINTAINER=	greg@unrelenting.technology
@@ -17,7 +17,7 @@ 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	SPIRV-Tools
-GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/external/spirv-headers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers
 
 CMAKE_ON=	SPIRV_SKIP_TESTS
 CMAKE_OFF=	SPIRV_WERROR
--- devel/spirv-tools/distinfo	(revision 556228)
+++ devel/spirv-tools/distinfo	(working copy)
@@ -1,5 +1,5 @@ 
-TIMESTAMP = 1589409763
-SHA256 (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 29f376f6ebc24d3ce39c1aa47101c4b5d256c8247e41068b541dd43bb88d4174
-SIZE (KhronosGroup-SPIRV-Tools-v2020.2_GH0.tar.gz) = 2126892
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = eece8a9e147d37997d425d5d2eeb2e757ad25adc30d6651467094f3b18609b5a
-SIZE (KhronosGroup-SPIRV-Headers-1.5.3_GH0.tar.gz) = 386853
+TIMESTAMP = 1606327101
+SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
+SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
+SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836
--- devel/vulkan-validation-layers/Makefile	(revision 556228)
+++ devel/vulkan-validation-layers/Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 
 PORTNAME=	vulkan-validation-layers
 DISTVERSIONPREFIX=	sdk-
-DISTVERSION=	1.2.135.0
+DISTVERSION=	1.2.154.0
 CATEGORIES=	devel graphics
 
 MAINTAINER=	greg@unrelenting.technology
@@ -21,6 +21,7 @@ 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ValidationLayers
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3.reservations1:headers/external/spirv-headers
 
 # WSI_* in here are leftover from when all of Vulkan SDK was in one repo
 CMAKE_OFF=	BUILD_TESTS BUILD_WSI_XCB_SUPPORT BUILD_WSI_XLIB_SUPPORT \
@@ -27,7 +28,9 @@ 
 		BUILD_WSI_WAYLAND_SUPPORT
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR=${LOCALBASE} \
-		-DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \
+	 	-DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \
+		-DSPIRV_HEADERS_INSTALL_DIR=${WRKDIR}/SPIRV-Headers-1.5.3.reservations1 \
+		-DSPIRV_TOOLS_INSTALL_DIR=${LOCALBASE} \
 		-DCMAKE_BUILD_TYPE=Release
 
 post-install:
--- devel/vulkan-validation-layers/distinfo	(revision 556228)
+++ devel/vulkan-validation-layers/distinfo	(working copy)
@@ -1,3 +1,5 @@ 
-TIMESTAMP = 1589407394
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 7a33aa13d9526da4deb945b3ccf5be9cf3c99fb4dfce2caf57640746c1c648d3
-SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.135.0_GH0.tar.gz) = 1980283
+TIMESTAMP = 1606326879
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 8898ab05d0d8dec04fbba03d0ed2e79a1eb5c0382e5c89d4c737b45a6648f7f9
+SIZE (KhronosGroup-Vulkan-ValidationLayers-sdk-1.2.154.0_GH0.tar.gz) = 2316466
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
+SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836