emulators/rpcs3: update to 0.0.28.15212

Changes: RPCS3/rpcs3@6dcf630...a6d8c43
freebsd · Jun 17, 2023 · 81b5604 · 81b5604
1 parent 3aad69f
commit 81b5604
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.28-15203 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g6dcf63009e
+DISTVERSION=	0.0.28-15212 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-ga6d8c4343f
 CATEGORIES=	emulators wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -51,7 +51,7 @@ ELF_FEATURES=	+noaslr,wxneeded:bin/${PORTNAME}
 
 .if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch)
 PATCH_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6
-PATCHFILES+=	c196f09833b4.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
+PATCHFILES+=	b1f76399f65b.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
 PKGNAMESUFFIX=	-${FLAVOR}
 USES:=		${USES:S/qt:5/qt:6/}
 USE_QT=		base multimedia svg
@@ -60,6 +60,9 @@ CONFLICTS_INSTALL=	${PORTNAME}
 
 post-patch:	${FLAVOR}-post-patch
 ${FLAVOR}-post-patch:
+# XXX Drop after upstream fixes "undefined symbol: fmt_class_string<QByteArray, void>::..."
+	@${REINPLACE_CMD} -E '/camera_log/s/\.(id|description)\(\)/&.toStdString()/g' \
+		${WRKSRC}/rpcs3/rpcs3qt/qt_camera_handler.cpp
 # patch(1) doesn't support renames unlike git-apply(1)
 	@${MV}  ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_surface.cpp \
 		${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_sink.cpp

diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1686784935
-SHA256 (RPCS3-rpcs3-v0.0.28-15203-g6dcf63009e_GH0.tar.gz) = cb04c29f8ca284f97f2e708619fc8bc2b32cf99079c3bf485413f30df79da0fd
-SIZE (RPCS3-rpcs3-v0.0.28-15203-g6dcf63009e_GH0.tar.gz) = 8876626
+TIMESTAMP = 1686937004
+SHA256 (RPCS3-rpcs3-v0.0.28-15212-ga6d8c4343f_GH0.tar.gz) = 7debfdea9075c582e4d9649fd7f7a55dc73fe5d6bcda2661ad22476684736108
+SIZE (RPCS3-rpcs3-v0.0.28-15212-ga6d8c4343f_GH0.tar.gz) = 8878088
 SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6
 SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879
 SHA256 (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 56863dbed27510742ed4ced54e9a5fba8658bcbfbb1cc5cdb978d7d537a3a874
@@ -23,5 +23,5 @@ SHA256 (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = c1e689e21a17aa9b838e67a37c3e
 SIZE (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = 21998970
 SHA256 (thestk-rtmidi-5.0.0_GH0.tar.gz) = c7923e4eee82b06c007435892cb2c3212d9007fa482c6b718943bda71c02c5a7
 SIZE (thestk-rtmidi-5.0.0_GH0.tar.gz) = 103144
-SHA256 (c196f09833b4.patch) = 87b02da248a2ff4d9e41fcc61ca6559d648e67a3fe34ac01e0b02253b5ed90c1
-SIZE (c196f09833b4.patch) = 113465
+SHA256 (b1f76399f65b.patch) = 3538c92949b2488293fcf46c9425041502a120d6d729a05f0186b40f019bd714
+SIZE (b1f76399f65b.patch) = 113176