From nobody Sun Apr 24 11:13:08 2022 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 1D6E21A85FAD; Sun, 24 Apr 2022 11:13:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KmQVX4xLZz4YYq; Sun, 24 Apr 2022 11:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650798788; 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=RRQxAnH/JsYpAGHfpkbnbENyDXCPu5K2Wwf1+1Dx+bU=; b=P6wptKasJhNmZevCwb19wiB7Ja8koeW6pBXoAVvE5HCnVj4Eq+pMwDArvhzvsr5k2wXZsn B2N7IL2NyCIY5IysK+3ccKufkS9I8SwElh+aG/wo2t3LySJn/BSoRy5pSQAGqnNbH+serA Yle6bdpEMZ+E35dfjjpDwHMqORn+bGDO7NBzXUNAOwkfURYscJjSWGjckOLo9T0inVUS38 agcrz+T5TIUL37UgLEZLNskl/Y9xHDooGJf38ssgZp+LwgqCokbkvsfcZZnkTUPM4XOtUm XCSgHJBw8WnqbRmjCgqOlS2+erI0WEoZFYvXtb/7hwtySMgt7WVh82HO8Y7c0w== 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 54C0D25397; Sun, 24 Apr 2022 11:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23OBD8CS033808; Sun, 24 Apr 2022 11:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OBD876033807; Sun, 24 Apr 2022 11:13:08 GMT (envelope-from git) Date: Sun, 24 Apr 2022 11:13:08 GMT Message-Id: <202204241113.23OBD876033807@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: 30f587d136d4 - main - emulators/rpcs3: unbreak on aarch64 after 66e5089f6d0d 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 30f587d136d4960d7b214bda0046ff166d5fbaf4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650798788; 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=RRQxAnH/JsYpAGHfpkbnbENyDXCPu5K2Wwf1+1Dx+bU=; b=ifLVNp/xkELduhhmxfmVWzYMBUvdShuwjDRuJhAbTXcXb2VFdpxZDBpgsCl+fqXmeM1KJP YxykUZrKitbNHiEPwzkpZLjlc4+WHJcgVGg1ctzvXDm5px8gk8dIRrVWDbwSbXYA5JHbuw j0brauje5rf4e0YCEtRfG2wRXB8n4XcYJq/xGvr/38+3U0hLIDljergb47Yg8QpjVGElVI zGY7CuezXawW8d/WC+Mvi1CsUeKt9fhSsOyUwk5yq5ZK4tbcA7Pu1A2S06aSdr5MKNb+CA +xu3O8dv+zEFlIQmZiEmCHX2tRyeNamHUPNC3+Duv86BDKmJI1k8zBA5pCEtKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650798788; a=rsa-sha256; cv=none; b=p1OYWMKKTyWBbaX1Fip1JYYwOLdYzmsryQeEBuHiuW/uK2QPAvsTdeqBnEEWrYKKehrf+6 mWh2ja4bj/zLbAQNQUfXixS9RqBigRiaH+h/ag1/R51E6RS20OHsBOuI/XEb9FamfA5pcm R/ygDX3/v+dlPGDzEyblS8XqIXaY7nzOGUmEXwITdL2sDcd0LEG79ubLsb4H0jEAzerIaH CWmf3hyn8R7pubfzwymjNiFK6uCT3aKafGSu5MlJoo2uBS4u90fChmSSifdwLqHDhgINJQ NkHqAbIvszkllWm/IzU4EzOxdGLkzBpZ1N45Hauf8zN3eT1hSaD0h34TJNvL0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=30f587d136d4960d7b214bda0046ff166d5fbaf4 commit 30f587d136d4960d7b214bda0046ff166d5fbaf4 Author: Jan Beich AuthorDate: 2022-04-24 10:03:53 +0000 Commit: Jan Beich CommitDate: 2022-04-24 11:12:09 +0000 emulators/rpcs3: unbreak on aarch64 after 66e5089f6d0d Utilities/Thread.cpp:1794:51: error: no member named 'pc' in '__mcontext' const bool is_executing = uptr(info->si_addr) == RIP(context); ^~~~~~~~~~~~ Utilities/Thread.cpp:1795:62: error: no member named 'pc' in '__mcontext' const u32 insn = is_executing ? 0 : *reinterpret_cast(RIP(context)); ^~~~~~~~~~~~ Utilities/Thread.cpp:1831:90: error: no member named 'pc' in '__mcontext' std::string msg = fmt::format("Segfault %s location %p at %p.\n", cause, info->si_addr, RIP(context)); ^~~~~~~~~~~~ Utilities/Thread.cpp:1225:46: note: expanded from macro 'RIP' #define RIP(context) ((context)->uc_mcontext.pc) ~~~~~~~~~~~~~~~~~~~~~~ ^ Reported by: pkg-fallout --- emulators/rpcs3/Makefile | 3 +++ emulators/rpcs3/distinfo | 2 ++ 2 files changed, 5 insertions(+) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 09516404bc41..a9259610d45c 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -4,6 +4,9 @@ DISTVERSION= 0.0.21-13478 # git rev-list --count HEAD DISTVERSIONSUFFIX= -g8acb62f6e CATEGORIES= emulators +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= beccce7b45dc.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/11868 + MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 3e0d910178ad..2496650afa8b 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -23,3 +23,5 @@ SHA256 (wolfSSL-wolfssl-v5.2.0-stable-245-gdcaa218ed_GH0.tar.gz) = d5d9d916797dc SIZE (wolfSSL-wolfssl-v5.2.0-stable-245-gdcaa218ed_GH0.tar.gz) = 20570430 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 +SHA256 (beccce7b45dc.patch) = ddc1f4d076ddbc4e0ce88abf1977ddce9871f4b29fe915dde3703577e04c39e1 +SIZE (beccce7b45dc.patch) = 1984