git: 66f939f7951a - main - emulators/rpcs3: switch to upstream libc++ 19 fix

The branch main has been updated by jbeich:

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

commit 66f939f7951a0f807aab2c7d1de6373289120a9c
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-11-11 22:02:58 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-11-12 00:07:04 +0000

    emulators/rpcs3: switch to upstream libc++ 19 fix
    
    This reverts commit 59e9d5118dc65497327518f97f252569c034f800.
---
 emulators/rpcs3/Makefile | 21 ++++-----------------
 emulators/rpcs3/distinfo |  4 ++--
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 120961b3ae1d..5a7af3e23489 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -2,8 +2,12 @@ PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.34 # git rev-list --count HEAD
 DISTVERSIONSUFFIX=	-17082-g17e78a9e6f
+PORTREVISION=	1
 CATEGORIES=	emulators wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	2b0f786b2dc3.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/16261
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PS3 emulator/debugger
 WWW=		https://rpcs3.net/
@@ -97,21 +101,4 @@ post-patch:
 		-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
 		${WRKSRC}/${PORTNAME}/git-version.cmake
 
-# https://github.com/RPCS3/rpcs3/issues/16259 (don't forget distinfo)
-.if exists(/usr/include/c++/v1/__thread/support.h)
-# XXX Move into separate port and standardize via USES
-GH_TUPLE+=	llvm:llvm-project:llvmorg-18.1.8:libcxx
-CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
-# Don't link against new libc++ as it's not necessary
-#LDFLAGS+=	-nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
-
-pre-configure:	bundled-libcxx
-bundled-libcxx:
-	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-		-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
-		-DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
-		-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
-	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
-.endif # exists(/usr/include/c++/v1/__thread/support.h)
-
 .include <bsd.port.mk>
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 7469f218f616..764a2ceb566b 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -29,5 +29,5 @@ SHA256 (wolfSSL-wolfssl-v5.7.2-stable_GH0.tar.gz) = 0f2ed82e345b833242705bbc4b08
 SIZE (wolfSSL-wolfssl-v5.7.2-stable_GH0.tar.gz) = 23591507
 SHA256 (thestk-rtmidi-6.0.0_GH0.tar.gz) = ef7bcda27fee6936b651c29ebe9544c74959d0b1583b716ce80a1c6fea7617f0
 SIZE (thestk-rtmidi-6.0.0_GH0.tar.gz) = 515502
-SHA256 (llvm-llvm-project-llvmorg-18.1.8_GH0.tar.gz) = 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856
-SIZE (llvm-llvm-project-llvmorg-18.1.8_GH0.tar.gz) = 205562783
+SHA256 (2b0f786b2dc3.patch) = 104926ee5ac385db8bd531489542b049a8ab261cbf77141ed2c185188b533a04
+SIZE (2b0f786b2dc3.patch) = 45215