From nobody Tue Nov 12 00:18:04 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XnRp44jrkz5cpjN; Tue, 12 Nov 2024 00:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XnRp43x7Bz4w7X; Tue, 12 Nov 2024 00:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731370684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5Tqh5fv79tq/Q/MwwTX3OjpmALjxWLeBCRScwaTmK0=; b=Yuh976aIrMQ0ZWKTeRRk2kQ4cKRQHBgYUrlBDe3ptR6TU6rUUFZXxhCog+ZAh818afrZGH 6ji/gHJ7GhnLFnarILScs9EF8S5i1Y3wtRdAePUUdjgRyoOuWXPqfTDKvPy5OMRfOwCA/D Ifzvj/u1gnFVbX3XGzROmg7EXf8nhwFR4F/Fjw5Gnp5hqAAnqIVqxlnWaEBUzJAp86q8Bd fnSUCqIwLZQ2MLrGAdDnFeQ1XM3iTGV4Bm/SRD954pHPc2pZoT8ISj2rVZEP4t+8AJgUKb dz6n9QmbpdW2YP1zqupb7YhLqTU+n5D1tEDJV0kGWqZd4lNTQdmsCHA6mgVuYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731370684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5Tqh5fv79tq/Q/MwwTX3OjpmALjxWLeBCRScwaTmK0=; b=J7IA2iBwUgatkHOjxnF6XPjE6QGiEBtCbNI04qvvyPrRWUQDfv6GXyBIkYPm5gEx8nDJot lIgHlSZKByL4Vaou0zataHf8e/0sTa09ddgKUmrjNMFqRYUvTks0BC3AVTk9WY3mMISHJK D13WhcqQww/CQu3ufp4gP5PPTgJsJxX25oowzPeCZFft5HxqVuniCI7SzM/ze+zxi9k5XV wXpW+cPXbn1A7dEsiIPBKg+krFMvxRSaKRU0pf5WjNxzjEw16A80CSg/KycLyGBrTEUeB1 8slBseGVOk0gW2d9FdXBjuHx3ueAsFYo4xhiqAsVUj4YDH9BpchGrC/i7LCPjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731370684; a=rsa-sha256; cv=none; b=GNuwa5lc8snKrmrP56DJWxsZY2v9jerhA4G2FR+XVVNaOAwC7LzKj05TqaaKlj3xTCCkjf i+3MmuC9KEVA+WE/wkUOhvhyKqmD0hdxOLXqsiRw58g0hT8abALX2sjkIJE5Z3Q6a46Lby VajnPzst2TBzvnoCcurg7iVtLROQuzNoabHuuSOmiH+wo8LU2Mq6t437Emq2XA2DmfaNj/ K8JyflRrcdvcAz7nue2Ata44O0/s08uYZ1PihAxoM5TOa7Cb42lFhLPxJCQZqm06m1pon5 fUr7W2xqi8Voyb09UIs+cerI0a6UMJQs17L+qD0WDnxrrEK8ERfXnGhkt0dC1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XnRp43YPFznX4; Tue, 12 Nov 2024 00:18:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AC0I4Lx023539; Tue, 12 Nov 2024 00:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AC0I4Ch023536; Tue, 12 Nov 2024 00:18:04 GMT (envelope-from git) Date: Tue, 12 Nov 2024 00:18:04 GMT Message-Id: <202411120018.4AC0I4Ch023536@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 66f939f7951a - main - emulators/rpcs3: switch to upstream libc++ 19 fix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f939f7951a0f807aab2c7d1de6373289120a9c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=66f939f7951a0f807aab2c7d1de6373289120a9c commit 66f939f7951a0f807aab2c7d1de6373289120a9c Author: Jan Beich AuthorDate: 2024-11-11 22:02:58 +0000 Commit: Jan Beich 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 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