diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index a60e971b7842..7918c459d551 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,90 +1,90 @@
 # $FreeBSD$
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.12-10811 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-ga86a3d2fe
+DISTVERSION=	0.0.12-10817 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g73d23eb6e
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PS3 emulator/debugger
 
 LICENSE=	APACHE20 BSD3CLAUSE BSL GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE
 LICENSE_FILE_BSL=	${WRKSRC_span}/LICENSE_1_0.txt
 LICENSE_FILE_MIT=	${WRKSRC_pugixml}/LICENSE.md
 LICENSE_FILE_ZLIB=	${WRKSRC_asmjit}/LICENSE.md
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
 		libavcodec.so:multimedia/ffmpeg
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \
 		RPCS3:llvm-mirror:f5679565d348:llvm/llvm \
 		Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \
 		FNA-XNA:FAudio:20.05:FAudio/3rdparty/FAudio \
 		google:flatbuffers:v1.11.0:flatbuffers/3rdparty/flatbuffers \
 		jbeder:yaml-cpp:yaml-cpp-0.6.3-30-g6a211f0:yamlcpp/3rdparty/yaml-cpp \
 		kobalicek:asmjit:fc251c9:asmjit/asmjit \
 		KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/Vulkan/spirv-headers \
 		KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/Vulkan/spirv-tools \
 		KhronosGroup:glslang:8.13.3743-225-g517f39ee:glslang/Vulkan/glslang \
 		RipleyTom:wolfssl:v4.3.0-stable-424-gd0749c654:wolfssl/3rdparty/wolfssl \
 		tcbrindle:span:9d7559a:span/3rdparty/span \
 		USCiLab:cereal:v1.3.0-5-g60c69df9:cereal/3rdparty/cereal \
 		zeux:pugixml:v1.9-51-g8bf806c:pugixml/3rdparty/pugixml
 
 USES=		cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \
 		openal:soft pkgconfig python:3.4+,build qt:5 xorg
 USE_GL=		gl glew
 USE_QT=		qmake_build buildtools_build core concurrent dbus gui widgets
 USE_XORG=	x11
 CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS
 LDFLAGS+=	-Wl,--as-needed # GLU
 
 # https://bugs.llvm.org/show_bug.cgi?id=46557
 BUILD_DEPENDS+=	clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 USES:=		${USES:Ncompiler*}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}
 CPP=		clang-cpp${LLVM_DEFAULT}
 
 OPTIONS_DEFINE=	ALSA EVDEV FAUDIO PULSEAUDIO VULKAN
 OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 ALSA_CMAKE_BOOL=	USE_ALSA
 
 EVDEV_DESC=		libevdev-based joystick support
 EVDEV_CMAKE_BOOL=	USE_LIBEVDEV
 EVDEV_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev
 
 FAUDIO_DESC=		FAudio audio support
 FAUDIO_USES=		sdl
 FAUDIO_USE=		SDL=sdl2
 FAUDIO_CMAKE_BOOL=	USE_FAUDIO
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 VULKAN_DESC=		Vulkan renderer
 VULKAN_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_CMAKE_BOOL=	USE_VULKAN
 
 post-patch:
 	@${REINPLACE_CMD} -e '/GIT_BRANCH/s/local_build/master/' \
 		 -e '/GIT_FULL_BRANCH/s/local_build/${GH_ACCOUNT}\/${GH_PROJECT}\/master/' \
 		-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
 .include <bsd.port.mk>
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index b142e67e38fe..13b145458763 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,31 +1,31 @@
-TIMESTAMP = 1598913531
-SHA256 (RPCS3-rpcs3-v0.0.12-10811-ga86a3d2fe_GH0.tar.gz) = b23c4b4516b8f30572367576716673bf0ad40ef774f62540331069724f2e859b
-SIZE (RPCS3-rpcs3-v0.0.12-10811-ga86a3d2fe_GH0.tar.gz) = 8470001
+TIMESTAMP = 1599083909
+SHA256 (RPCS3-rpcs3-v0.0.12-10817-g73d23eb6e_GH0.tar.gz) = a09f541e32d80d160457b1e6cfe1a573d9abedd488caf170e51f7752297662e7
+SIZE (RPCS3-rpcs3-v0.0.12-10817-g73d23eb6e_GH0.tar.gz) = 8472327
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 201b9be34c7ef5f5a81d21b11c532040546cb602307479a4dd56357c02caa7f3
 SIZE (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 55246543
 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95
 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521
 SHA256 (FNA-XNA-FAudio-20.05_GH0.tar.gz) = 62e68c61970552f27f0bc4943bf92af5f4b9ae2a30ed4fa70784e1f7056c6625
 SIZE (FNA-XNA-FAudio-20.05_GH0.tar.gz) = 1130178
 SHA256 (google-flatbuffers-v1.11.0_GH0.tar.gz) = 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 SIZE (google-flatbuffers-v1.11.0_GH0.tar.gz) = 894944
 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 4b832de2a1d0934ecc58c9c920e17908e52305f9d99d7d24625d3f13e974e0cc
 SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 1398571
 SHA256 (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 0fb6271fccf8ee86d27affda7e27a6d655bfabfda83a7dd0d41f7fd05b384aad
 SIZE (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 446910
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
 SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836
 SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2
 SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982
 SHA256 (KhronosGroup-glslang-8.13.3743-225-g517f39ee_GH0.tar.gz) = 5414072b212552f0ee7a18efd4e56484225bcc8035ed8d1f6274b431d95969e6
 SIZE (KhronosGroup-glslang-8.13.3743-225-g517f39ee_GH0.tar.gz) = 3241107
 SHA256 (RipleyTom-wolfssl-v4.3.0-stable-424-gd0749c654_GH0.tar.gz) = fc590a85d20c400aa623507c151010ac109b1490a0c1c0dd6db84aca812a4f76
 SIZE (RipleyTom-wolfssl-v4.3.0-stable-424-gd0749c654_GH0.tar.gz) = 7157837
 SHA256 (tcbrindle-span-9d7559a_GH0.tar.gz) = 4fbe8364b8ff9388fd6ca1a11ce39ff448af76394d561d6f879cf1180b14f160
 SIZE (tcbrindle-span-9d7559a_GH0.tar.gz) = 130675
 SHA256 (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 3931a29bccc2ebbed13fcc3229643bfd9cdf9e81b5f09ed298f2062016e6f302
 SIZE (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 374806
 SHA256 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d
 SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956