From 1ca02f02691f60bedf1f55a3d4289b57a9b3b7be Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 9 Oct 2017 20:40:35 +0000 Subject: [PATCH] emulators/rpcs3: update to 0.0.3.425 Changes: https://github.com/RPCS3/rpcs3/compare/3907dd04...1d375cb1 MFH: 2017Q4 (implicit for snapshots?) --- emulators/rpcs3/Makefile | 4 +- emulators/rpcs3/distinfo | 6 +-- .../rpcs3/files/extra-patch-no-thread_local | 41 +++++++++++++++++++ 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index d85192e8292e..00fd43a7a6d0 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.3-407 -DISTVERSIONSUFFIX= -g3907dd04 +DISTVERSION= 0.0.3-425 +DISTVERSIONSUFFIX= -g1d375cb1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 0103768c82ab..73848b771287 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1507222297 -SHA256 (RPCS3-rpcs3-v0.0.3-407-g3907dd04_GH0.tar.gz) = bc35c3ba49945051a41329e0f17f60f3733dbddf5282e6747abb400be408ed40 -SIZE (RPCS3-rpcs3-v0.0.3-407-g3907dd04_GH0.tar.gz) = 3522527 +TIMESTAMP = 1507569941 +SHA256 (RPCS3-rpcs3-v0.0.3-425-g1d375cb1_GH0.tar.gz) = 89b133fab7032d4e8dae62889784a1b5213c802c37a1d8f1f9ce85e9e636d511 +SIZE (RPCS3-rpcs3-v0.0.3-425-g1d375cb1_GH0.tar.gz) = 3530456 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = e50e4f4e9035e891e16867e995f44aac87ce734a9dde169f02fc9719b2ce3642 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-25-gca39ce8_GH0.tar.gz) = 105623 SHA256 (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 3b2a7e21625d8cbeb3aa1841b8816f6cab0752e89008b9fc67a325c800f153b5 diff --git a/emulators/rpcs3/files/extra-patch-no-thread_local b/emulators/rpcs3/files/extra-patch-no-thread_local index 201c6b43ad6f..36fd10c96e35 100644 --- a/emulators/rpcs3/files/extra-patch-no-thread_local +++ b/emulators/rpcs3/files/extra-patch-no-thread_local @@ -30,6 +30,47 @@ https://github.com/RPCS3/rpcs3/commit/c1450ad61627 // Used character: U+00B7 (Middle Dot) switch (msg.sev) +--- Utilities/mutex.cpp.orig 2017-10-08 20:37:54 UTC ++++ Utilities/mutex.cpp +@@ -5,8 +5,10 @@ + #include + #include + ++#if 0 + // TLS variable for tracking owned mutexes + thread_local std::vector g_tls_locks; ++#endif + + void shared_mutex::imp_lock_shared(s64 _old) + { +@@ -258,6 +260,7 @@ bool shared_mutex::try_lock_degrade() + return m_value.compare_and_swap_test(0, c_one - c_min); + } + ++#if 0 + safe_reader_lock::safe_reader_lock(shared_mutex& mutex) + : m_mutex(mutex) + , m_is_owned(false) +@@ -332,3 +335,4 @@ safe_writer_lock::~safe_writer_lock() + + // TODO: order locks + } ++#endif +--- Utilities/mutex.h.orig 2017-10-08 20:37:54 UTC ++++ Utilities/mutex.h +@@ -177,6 +177,7 @@ class writer_lock final (public) + } + }; + ++#if 0 + // Safe reader lock. Can be recursive above other safe locks (reader or writer). + class safe_reader_lock final + { +@@ -229,3 +230,4 @@ class safe_writer_lock final (public) + + ~safe_writer_lock(); + }; ++#endif --- Utilities/types.h.orig 2017-08-24 18:20:18 UTC +++ Utilities/types.h @@ -32,6 +32,7 @@