git: 8255505ca190 - main - emulators/rpcs3: update to 0.0.29

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 31 Jul 2023 18:36:37 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8255505ca190dc7f272c4cd606eabd8e69540dc2

commit 8255505ca190dc7f272c4cd606eabd8e69540dc2
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-31 17:03:24 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-31 18:36:13 +0000

    emulators/rpcs3: update to 0.0.29
    
    Changes:        https://github.com/RPCS3/rpcs3/compare/9b3a878c18...6cd5a7eab9
---
 emulators/rpcs3/Makefile | 30 ++++--------------------------
 emulators/rpcs3/distinfo |  8 +++-----
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 854cdb404976..e5db8ffb3fcd 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.28-15417 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g9b3a878c18
+DISTVERSION=	0.0.29 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-15419-g6cd5a7eab9
 CATEGORIES=	emulators wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -13,8 +13,6 @@ LICENSE_COMB=	multi
 LICENSE_FILE_ISCL=	${WRKSRC_cubeb}/LICENSE
 LICENSE_FILE_ZLIB=	${WRKSRC_asmjit}/LICENSE.md
 
-FLAVORS=	qt5 qt6
-
 BUILD_DEPENDS=	flatc:devel/flatbuffers
 LIB_DEPENDS=	libxxhash.so:devel/xxhash \
 		libcurl.so:ftp/curl \
@@ -39,9 +37,9 @@ GH_TUPLE=	RPCS3:hidapi:hidapi-0.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \
 		wolfSSL:wolfssl:v5.6.3-stable:wolfssl/3rdparty/wolfssl/wolfssl
 
 USES=		cmake elfctl gl iconv:wchar_t llvm:min=16,lib localbase:ldflags \
-		openal:soft pkgconfig python:build qt:5 xorg
+		openal:soft pkgconfig python:build qt:6 xorg
 USE_GL=		gl glew
-USE_QT=		qmake:build buildtools:build core concurrent dbus gui multimedia svg widgets
+USE_QT=		base multimedia svg
 USE_XORG=	x11
 CMAKE_ON=	CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^/USE_SYSTEM_/}
 CMAKE_ON+=	BUNDLE_SPEEX # only used by cubeb tests
@@ -49,26 +47,6 @@ CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS
 LDFLAGS+=	-Wl,--as-needed # GLU
 ELF_FEATURES=	+wxneeded:bin/${PORTNAME}
 
-.if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch)
-PATCH_SITES+=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6
-PATCHFILES+=	d119cf6e96cb.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471
-PKGNAMESUFFIX=	-${FLAVOR}
-USES:=		${USES:S/qt:5/qt:6/}
-USE_QT=		base multimedia svg
-
-CONFLICTS_INSTALL=	${PORTNAME}
-
-post-patch:	${FLAVOR}-post-patch
-${FLAVOR}-post-patch:
-# 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
-	@${MV}  ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_surface.h \
-		${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_sink.h
-.else
-CONFLICTS_INSTALL=	${PORTNAME}-qt6
-.endif
-
 OPTIONS_DEFINE=	ALSA EVDEV FAUDIO PULSEAUDIO JACK SDL SNDIO VULKAN
 OPTIONS_DEFAULT=EVDEV FAUDIO PULSEAUDIO JACK SDL SNDIO VULKAN
 
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index c49bff502d93..a88efa8ef912 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1690798795
-SHA256 (RPCS3-rpcs3-v0.0.28-15417-g9b3a878c18_GH0.tar.gz) = b4d90cd665971d7650c4843acead631500dae62be2b2f2afcb0fe70ec524ef69
-SIZE (RPCS3-rpcs3-v0.0.28-15417-g9b3a878c18_GH0.tar.gz) = 8877649
+TIMESTAMP = 1690823004
+SHA256 (RPCS3-rpcs3-v0.0.29-15419-g6cd5a7eab9_GH0.tar.gz) = e7a5dba2429b02d79692238e930557c88d1e54ca0f82fcca2e8b5eafa704fcd4
+SIZE (RPCS3-rpcs3-v0.0.29-15419-g6cd5a7eab9_GH0.tar.gz) = 8876587
 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,3 @@ SHA256 (wolfSSL-wolfssl-v5.6.3-stable_GH0.tar.gz) = 2e74a397fa797c2902d7467d500d
 SIZE (wolfSSL-wolfssl-v5.6.3-stable_GH0.tar.gz) = 22137280
 SHA256 (thestk-rtmidi-5.0.0_GH0.tar.gz) = c7923e4eee82b06c007435892cb2c3212d9007fa482c6b718943bda71c02c5a7
 SIZE (thestk-rtmidi-5.0.0_GH0.tar.gz) = 103144
-SHA256 (d119cf6e96cb.patch) = 5b195dfeb871852ffb83447f5020dd9258ad0d3564980e8705112e2da6871918
-SIZE (d119cf6e96cb.patch) = 118409