diff --git a/graphics/filament/Makefile b/graphics/filament/Makefile
index ef6a4299b88b..6f91edc8e3a4 100644
--- a/graphics/filament/Makefile
+++ b/graphics/filament/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	filament
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.31.5
+DISTVERSION=	1.31.6
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Real-time physically based rendering engine
 WWW=		https://google.github.io/filament/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	compilation breaks: unexpected token in operand, see https://github.com/google/filament/issues/6131
 BROKEN_i386=	compilation breaks: register r11 is only available in 64-bit mode
 
 BUILD_DEPENDS=	bash:shells/bash \
 		evdev-proto>0:devel/evdev-proto
 
 USES=		cmake compiler:c++17-lang localbase:ldflags python:build sdl shebangfix xorg
 USE_SDL=	sdl2
 USE_XORG=	x11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 SHEBANG_FILES=	build/launch-c.in build/launch-cxx.in
 
 #CMAKE_ON=	BUILD_SHARED_LIBS # not yet supported, see https://github.com/google/filament/issues/1075
 CMAKE_OFF=	USE_STATIC_LIBCXX FILAMENT_ENABLE_JAVA
 CMAKE_ARGS+=	-DDIST_DIR="." # prevent subdirectory for libraries
 CMAKE_ARGS+=	-DUSE_CCACHE:BOOL=${CCACHE_ENABLED:tu}
 CMAKE_ARGS+=	-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 LDFLAGS+=	-lexecinfo -lSDL2
 
 OPTIONS_DEFINE=		SAMPLES
 OPTIONS_SUB=		yes
 
 SAMPLES_DESC=		Build samples
 SAMPLES_CMAKE_OFF=	-DFILAMENT_SKIP_SAMPLES=ON
 
 # gltf_viewer is broken with the Vulkan backend, see https://github.com/google/filament/issues/6445
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"/proc/self/exe"|"/proc/curproc/file"|' ${WRKSRC}/libs/utils/src/linux/Path.cpp
 
 post-install:
 	# remove unnecessary files
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r README.md LICENSE docs
 	# remove conflicting file, see https://github.com/google/filament/issues/5957
 	@${RM} ${STAGEDIR}${PREFIX}/lib/libzstd.a
 
 .include <bsd.port.mk>
diff --git a/graphics/filament/distinfo b/graphics/filament/distinfo
index 8a6903e3feb6..9207c6cabfc0 100644
--- a/graphics/filament/distinfo
+++ b/graphics/filament/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677127841
-SHA256 (google-filament-v1.31.5_GH0.tar.gz) = b929603ffd21158278bba5e93123692ec5bb951c2fe83dbb4f53ca366fed5474
-SIZE (google-filament-v1.31.5_GH0.tar.gz) = 496393895
+TIMESTAMP = 1677779151
+SHA256 (google-filament-v1.31.6_GH0.tar.gz) = 5b63ff2397e60a9dc64c0d613534946db2ea2f189c73356691deb594be9f95cd
+SIZE (google-filament-v1.31.6_GH0.tar.gz) = 496384639
diff --git a/graphics/filament/files/patch-CMakeLists.txt b/graphics/filament/files/patch-CMakeLists.txt
index 013b1701edc6..8a81794c1f14 100644
--- a/graphics/filament/files/patch-CMakeLists.txt
+++ b/graphics/filament/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2022-12-20 16:40:07 UTC
+--- CMakeLists.txt.orig	2023-03-01 19:24:13 UTC
 +++ CMakeLists.txt
-@@ -66,7 +66,7 @@ endif()
+@@ -68,7 +68,7 @@ endif()
  # Support for ccache
  # ==================================================================================================
  find_program(CCACHE_PROGRAM ccache)
 -if (CCACHE_PROGRAM)
 +if (USE_CCACHE AND CCACHE_PROGRAM)
-     set(C_LAUNCHER   "${CCACHE_PROGRAM}")
-     set(CXX_LAUNCHER "${CCACHE_PROGRAM}")
- 
+     if (WIN32)
+         set(CMAKE_C_COMPILER_LAUNCHER   "${CCACHE_PROGRAM}")
+         set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")