From 0721304a803f93faae5489b57aa37920d2693f38 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 13 Oct 2019 00:17:20 +0000 Subject: [PATCH] emulators/rpcs3: update to 0.0.6.8871 - Drop GDB optiot which disappeared upstream after r514202 Changes: https://github.com/RPCS3/rpcs3/compare/0172e097f...9bcd7b534 --- emulators/rpcs3/Makefile | 10 +++------- emulators/rpcs3/distinfo | 6 +++--- emulators/rpcs3/files/extra-patch-revert-6b1e1e402049 | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 41fb56e97089..8f5af37fc94f 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.7-8861 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g0172e097f +DISTVERSION= 0.0.7-8871 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g9bcd7b534 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -57,7 +57,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-4504ac2d1248 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-5bd17a44c972 .endif -OPTIONS_DEFINE= ALSA EVDEV GDB LLVM PULSEAUDIO VULKAN +OPTIONS_DEFINE= ALSA EVDEV LLVM PULSEAUDIO VULKAN OPTIONS_DEFAULT=LLVM VULKAN ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -69,10 +69,6 @@ EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev -GDB_DESC= GDB remote stub (powerpc64 target) -GDB_CMAKE_BOOL= WITH_GDB -GDB_BROKEN= https://github.com/RPCS3/rpcs3/issues/5946 - LLVM_DESC= LLVM-based PPU recompiler LLVM_CMAKE_BOOL_OFF= WITHOUT_LLVM diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 4cc231ca6a66..aca1d447c18b 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1570823710 -SHA256 (RPCS3-rpcs3-v0.0.7-8861-g0172e097f_GH0.tar.gz) = 00c3483845c73b0d5765d7c0d9a70f615bdcc2cc0db2ea3230121543ef2914a4 -SIZE (RPCS3-rpcs3-v0.0.7-8861-g0172e097f_GH0.tar.gz) = 5606464 +TIMESTAMP = 1570914153 +SHA256 (RPCS3-rpcs3-v0.0.7-8871-g9bcd7b534_GH0.tar.gz) = fe6d2620c9b3ea04a9e72dfb29808e2d09ffad8f0f8923f87a97517023665752 +SIZE (RPCS3-rpcs3-v0.0.7-8871-g9bcd7b534_GH0.tar.gz) = 5609537 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 SHA256 (RPCS3-llvm-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e diff --git a/emulators/rpcs3/files/extra-patch-revert-6b1e1e402049 b/emulators/rpcs3/files/extra-patch-revert-6b1e1e402049 index d70a3f656d59..407e44edd69f 100644 --- a/emulators/rpcs3/files/extra-patch-revert-6b1e1e402049 +++ b/emulators/rpcs3/files/extra-patch-revert-6b1e1e402049 @@ -181,8 +181,8 @@ rpcs3/Emu/GDB.cpp:33:10: fatal error: 'charconv' file not found { start_server(); -- while (server_socket != -1 && !Emu.IsStopped()) -+ while (!Emu.IsStopped()) +- while (server_socket != -1 && thread_ctrl::state() != thread_state::aborting) ++ while (thread_ctrl::state() != thread_state::aborting) { sockaddr_in client; socklen_t client_len = sizeof(client);