svn commit: r452753 - in branches/2017Q4/emulators/rpcs3: . files
Jan Beich
jbeich at FreeBSD.org
Mon Oct 23 23:17:42 UTC 2017
Author: jbeich
Date: Mon Oct 23 23:17:41 2017
New Revision: 452753
URL: https://svnweb.freebsd.org/changeset/ports/452753
Log:
MFH: r451396 r451641 r452036 r452523 r452749
emulators/rpcs3: update to 0.0.3.469
- Convert to WRKSRC helpers
Changes: https://github.com/RPCS3/rpcs3/compare/eb8af974...96fd8556
Approved by: ports-secteam (swills)
Modified:
branches/2017Q4/emulators/rpcs3/Makefile
branches/2017Q4/emulators/rpcs3/distinfo
branches/2017Q4/emulators/rpcs3/files/extra-patch-no-thread_local
Directory Properties:
branches/2017Q4/ (props changed)
Modified: branches/2017Q4/emulators/rpcs3/Makefile
==============================================================================
--- branches/2017Q4/emulators/rpcs3/Makefile Mon Oct 23 23:06:54 2017 (r452752)
+++ branches/2017Q4/emulators/rpcs3/Makefile Mon Oct 23 23:17:41 2017 (r452753)
@@ -2,8 +2,8 @@
PORTNAME= rpcs3
DISTVERSIONPREFIX= v
-DISTVERSION= 0.0.3-391
-DISTVERSIONSUFFIX= -geb8af974
+DISTVERSION= 0.0.3-469
+DISTVERSIONSUFFIX= -g96fd8556
CATEGORIES= emulators
MAINTAINER= jbeich at FreeBSD.org
@@ -11,10 +11,10 @@ COMMENT= PS3 emulator/debugger
LICENSE= BSD3CLAUSE BSL GPLv2 MIT ZLIB
LICENSE_COMB= multi
-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/3rdparty/cereal/LICENSE
-LICENSE_FILE_BSL= ${WRKSRC}/Utilities/LICENSE_1_0.txt
-LICENSE_FILE_MIT= ${WRKSRC}/3rdparty/GSL/LICENSE
-LICENSE_FILE_ZLIB= ${WRKSRC}/asmjit/LICENSE.md
+LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE
+LICENSE_FILE_BSL= ${WRKSRC_Optional}/LICENSE
+LICENSE_FILE_MIT= ${WRKSRC_GSL}/LICENSE
+LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md
LIB_DEPENDS= libpng.so:graphics/png \
libavcodec.so:multimedia/ffmpeg
@@ -27,6 +27,7 @@ GH_ACCOUNT= RPCS3
GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-25-gca39ce8:hidapi/3rdparty/hidapi \
RPCS3:pugixml:f205aaf:pugixml/3rdparty/pugixml \
RPCS3:yaml-cpp:release-0.5.3-62-g017626a:yamlcpp/Utilities/yaml-cpp \
+ akrzemi1:Optional:f27e790:Optional/3rdparty/Optional \
kobalicek:asmjit:1370fe6:asmjit/asmjit \
Microsoft:GSL:fc5fce4:GSL/3rdparty/GSL \
USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal
Modified: branches/2017Q4/emulators/rpcs3/distinfo
==============================================================================
--- branches/2017Q4/emulators/rpcs3/distinfo Mon Oct 23 23:06:54 2017 (r452752)
+++ branches/2017Q4/emulators/rpcs3/distinfo Mon Oct 23 23:17:41 2017 (r452753)
@@ -1,12 +1,14 @@
-TIMESTAMP = 1506612197
-SHA256 (RPCS3-rpcs3-v0.0.3-391-geb8af974_GH0.tar.gz) = 0762e86de03c2f1913bf03856c516b9e33405a3767690fa633432b892602e068
-SIZE (RPCS3-rpcs3-v0.0.3-391-geb8af974_GH0.tar.gz) = 3516587
+TIMESTAMP = 1508620480
+SHA256 (RPCS3-rpcs3-v0.0.3-469-g96fd8556_GH0.tar.gz) = a1dc3f4e6ed4b4ea2882408d6a7a658c08937829eab8bbef7396c5e502a0c53a
+SIZE (RPCS3-rpcs3-v0.0.3-469-g96fd8556_GH0.tar.gz) = 3535949
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
SIZE (RPCS3-pugixml-f205aaf_GH0.tar.gz) = 76332
SHA256 (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 1d4b32443f137c23b68d3cb183ba6fb48eb76be2b0b30016970adff5c770d841
SIZE (RPCS3-yaml-cpp-release-0.5.3-62-g017626a_GH0.tar.gz) = 65888
+SHA256 (akrzemi1-Optional-f27e790_GH0.tar.gz) = d9f81fa3699b724812994897180365b7ee2fdef1549239d5086722bd4552baf1
+SIZE (akrzemi1-Optional-f27e790_GH0.tar.gz) = 16055
SHA256 (kobalicek-asmjit-1370fe6_GH0.tar.gz) = cc064a8e495959ee525803bd83a4f9b2b3bf6e9aacbc7538e8ac3c20fb12e83e
SIZE (kobalicek-asmjit-1370fe6_GH0.tar.gz) = 447958
SHA256 (Microsoft-GSL-fc5fce4_GH0.tar.gz) = 2df1538ff240bf4dd3ef44ba8c832451376fff8e74f7734d32fc8c337557a64d
Modified: branches/2017Q4/emulators/rpcs3/files/extra-patch-no-thread_local
==============================================================================
--- branches/2017Q4/emulators/rpcs3/files/extra-patch-no-thread_local Mon Oct 23 23:06:54 2017 (r452752)
+++ branches/2017Q4/emulators/rpcs3/files/extra-patch-no-thread_local Mon Oct 23 23:17:41 2017 (r452753)
@@ -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 <vector>
+ #include <algorithm>
+
++#if 0
+ // TLS variable for tracking owned mutexes
+ thread_local std::vector<shared_mutex*> 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 @@
More information about the svn-ports-all
mailing list