Index: head/graphics/shaderc/Makefile
===================================================================
--- head/graphics/shaderc/Makefile	(revision 559308)
+++ head/graphics/shaderc/Makefile	(revision 559309)
@@ -1,35 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	shaderc
 DISTVERSIONPREFIX=v
 DISTVERSION=	2020.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GLSL/HLSL to SPIR-V shader compiler
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libHLSL.a:graphics/glslang \
 		${LOCALBASE}/lib/libSPIRV-Tools-opt.a:graphics/spirv-tools
 
 USES=		cmake compiler:c++11-lib pkgconfig localbase:ldflags python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_TUPLE=	KhronosGroup:SPIRV-Headers:1.5.3:headers/third_party/spirv-headers
 
+LDFLAGS+=	-Wl,-z,defs # glslang
 CMAKE_ON+=	SHADERC_SKIP_TESTS
 CMAKE_ARGS+=	-DSPIRV-Headers_SOURCE_DIR=${WRKSRC}/third_party/spirv-headers
 CMAKE_ARGS+=	-Dglslang_SOURCE_DIR=${LOCALBASE}/include/glslang
 
 # https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/shaderc
 
 post-patch:
 	${REINPLACE_CMD} '/examples/d;/third_party/d' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} '/build-version/d' ${WRKSRC}/glslc/CMakeLists.txt
 	${ECHO} "\"${DISTVERSIONFULL}\"" > ${WRKSRC}/glslc/src/build-version.inc
 
 .include <bsd.port.mk>
Index: head/graphics/shaderc/files/patch-system-glslang
===================================================================
--- head/graphics/shaderc/files/patch-system-glslang	(revision 559308)
+++ head/graphics/shaderc/files/patch-system-glslang	(revision 559309)
@@ -1,18 +1,20 @@
 ld: error: undefined symbol: glslang::InitializeProcess()
 >>> referenced by compiler.cc
 >>>               compiler.cc.o:(shaderc_util::GlslangInitializer::GlslangInitializer()) in archive libshaderc_util/libshaderc_util.a
 ld: error: undefined symbol: ConstructCompiler(EShLanguage, int)
 >>> referenced by ShaderLang.cpp
 >>>               ShaderLang.cpp.o:(ShConstructCompiler) in archive /usr/local/lib/libMachineIndependent.a
 
---- glslc/CMakeLists.txt.orig	2020-12-24 21:26:10 UTC
-+++ glslc/CMakeLists.txt
-@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
- endif(SHADERC_ENABLE_WGSL_OUTPUT)
+--- libshaderc_util/CMakeLists.txt.orig	2020-12-09 21:30:21 UTC
++++ libshaderc_util/CMakeLists.txt
+@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
  
- target_link_libraries(glslc PRIVATE
--  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
-+  glslang MachineIndependent GenericCodeGen OSDependent OGLCompiler # Glslang libraries
-   $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
-   shaderc_util shaderc                                  # internal Shaderc libraries
-   ${CMAKE_THREAD_LIBS_INIT})
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV
+-  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
++  glslang MachineIndependent GenericCodeGen OSDependent OGLCompiler HLSL glslang SPIRV
++  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
+ 
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_util