git: 30f587d136d4 - main - emulators/rpcs3: unbreak on aarch64 after 66e5089f6d0d
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Apr 2022 11:13:08 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=30f587d136d4960d7b214bda0046ff166d5fbaf4
commit 30f587d136d4960d7b214bda0046ff166d5fbaf4
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-04-24 10:03:53 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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<u32*>(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