git: c5ee1236c6ac - main - emulators/rpcs3: unbundle more libs except wolfssl

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 20 Jan 2022 00:58:41 UTC
The branch main has been updated by jbeich:

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

commit c5ee1236c6ac38faa40f102ef960089d2d21aaaa
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-19 15:08:33 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-20 00:58:14 +0000

    emulators/rpcs3: unbundle more libs except wolfssl
---
 emulators/rpcs3/Makefile | 16 ++++++++--------
 emulators/rpcs3/distinfo |  6 ------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 2dbda82d0ba8..78417c3b9b0e 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.20-13190 # git rev-list --count HEAD
 DISTVERSIONSUFFIX=	-g58fdf58150
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -10,12 +11,14 @@ COMMENT=	PS3 emulator/debugger
 LICENSE=	APACHE20 ISCL GPLv2 MIT ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_ISCL=	${WRKSRC_cubeb}/LICENSE
-LICENSE_FILE_MIT=	${WRKSRC_pugixml}/LICENSE.md
 LICENSE_FILE_ZLIB=	${WRKSRC_asmjit}/LICENSE.md
 
-LIB_DEPENDS=	libcurl.so:ftp/curl \
+BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers
+LIB_DEPENDS=	libxxhash.so:devel/xxhash \
+		libcurl.so:ftp/curl \
 		libpng.so:graphics/png \
-		libavcodec.so:multimedia/ffmpeg
+		libavcodec.so:multimedia/ffmpeg \
+		libpugixml.so:textproc/pugixml
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
@@ -24,23 +27,20 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
 GH_TUPLE=	RPCS3:hidapi:hidapi-0.11.0-2-gc47734c:hidapi/3rdparty/hidapi/hidapi \
 		RPCS3:llvm-mirror:509d31ad8967:llvm/llvm \
-		Cyan4973:xxHash:v0.8.1:xxHash/3rdparty/xxHash \
 		asmjit:asmjit:fc2a5d8:asmjit/3rdparty/asmjit/asmjit \
-		google:flatbuffers:v2.0.0:flatbuffers/3rdparty/flatbuffers \
 		jbeder:yaml-cpp:yaml-cpp-0.7.0-1-g0b67821:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \
 		KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \
 		KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \
 		KhronosGroup:glslang:11.7.1:glslang/3rdparty/glslang/glslang \
 		kinetiknz:cubeb:cubeb-0.2-1345-g773f16b:cubeb/3rdparty/cubeb/cubeb \
-		wolfSSL:wolfssl:v5.1.0-stable-47-g4bbf90d60:wolfssl/3rdparty/wolfssl/wolfssl \
-		zeux:pugixml:v1.11.4:pugixml/3rdparty/pugixml
+		wolfSSL:wolfssl:v5.1.0-stable-47-g4bbf90d60:wolfssl/3rdparty/wolfssl/wolfssl
 
 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 multimedia svg widgets
 USE_XORG=	x11
-CMAKE_ON=	CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
+CMAKE_ON=	CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^/USE_SYSTEM_/}
 CMAKE_ON+=	BUNDLE_SPEEX # only used by cubeb tests
 CMAKE_OFF=	USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS
 LDFLAGS+=	-Wl,--as-needed # GLU
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index b24da5f6fac4..9f3418ebe728 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -5,12 +5,8 @@ SHA256 (RPCS3-hidapi-hidapi-0.11.0-2-gc47734c_GH0.tar.gz) = be71b1f2f57f2e243e72
 SIZE (RPCS3-hidapi-hidapi-0.11.0-2-gc47734c_GH0.tar.gz) = 232983
 SHA256 (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 82a62696fb4a24187ed50146edfba3e587aa7ec3c809e644e0d69a530f06e6f3
 SIZE (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 29967699
-SHA256 (Cyan4973-xxHash-v0.8.1_GH0.tar.gz) = 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c
-SIZE (Cyan4973-xxHash-v0.8.1_GH0.tar.gz) = 171552
 SHA256 (asmjit-asmjit-fc2a5d8_GH0.tar.gz) = e4550efadfbc0f35ca7eecf099d3b8afff764bb4808061ee20aeb2637562f5c0
 SIZE (asmjit-asmjit-fc2a5d8_GH0.tar.gz) = 963573
-SHA256 (google-flatbuffers-v2.0.0_GH0.tar.gz) = 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4
-SIZE (google-flatbuffers-v2.0.0_GH0.tar.gz) = 1538022
 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.7.0-1-g0b67821_GH0.tar.gz) = 97ed209bb218153ba1cd8096e4d259e559ce7119bfc93013fc843c83651047ae
 SIZE (jbeder-yaml-cpp-yaml-cpp-0.7.0-1-g0b67821_GH0.tar.gz) = 1033619
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd
@@ -23,7 +19,5 @@ SHA256 (kinetiknz-cubeb-cubeb-0.2-1345-g773f16b_GH0.tar.gz) = f32cef6db43124d847
 SIZE (kinetiknz-cubeb-cubeb-0.2-1345-g773f16b_GH0.tar.gz) = 220225
 SHA256 (wolfSSL-wolfssl-v5.1.0-stable-47-g4bbf90d60_GH0.tar.gz) = ec415fba7c5c3ae40893f886a528e205dc5523caa840149ef9db4efab966357c
 SIZE (wolfSSL-wolfssl-v5.1.0-stable-47-g4bbf90d60_GH0.tar.gz) = 11102581
-SHA256 (zeux-pugixml-v1.11.4_GH0.tar.gz) = 017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade
-SIZE (zeux-pugixml-v1.11.4_GH0.tar.gz) = 566750
 SHA256 (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = c9411f1882eaf0c190fd5b412deb0bd7dba61a48df243d3408298cc6f53b6921
 SIZE (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = 147284646