Date: Sun, 20 Oct 2019 00:48:20 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514865 - in head/emulators/rpcs3: . files Message-ID: <201910200048.x9K0mKYf084435@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Oct 20 00:48:20 2019 New Revision: 514865 URL: https://svnweb.freebsd.org/changeset/ports/514865 Log: emulators/rpcs3: update to 0.0.6.8941 Changes: https://github.com/RPCS3/rpcs3/compare/cb362b408...0ef7ad129 Added: head/emulators/rpcs3/files/extra-patch-revert-db7042b986ab (contents, props changed) Modified: head/emulators/rpcs3/Makefile (contents, props changed) head/emulators/rpcs3/distinfo (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Sun Oct 20 00:48:10 2019 (r514864) +++ head/emulators/rpcs3/Makefile Sun Oct 20 00:48:20 2019 (r514865) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.7-8909 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -gcb362b408 +DISTVERSION= 0.0.7-8941 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g0ef7ad129 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -50,6 +50,7 @@ LLD_UNSAFE= yes # XXX ports/219089 # XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01 # XXX Switch to bundled libc++ to avoid error-prone reverts .if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-db7042b986ab EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-6b1e1e402049 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-9710473a2e3e EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-revert-f9ad6358563b Modified: head/emulators/rpcs3/distinfo ============================================================================== --- head/emulators/rpcs3/distinfo Sun Oct 20 00:48:10 2019 (r514864) +++ head/emulators/rpcs3/distinfo Sun Oct 20 00:48:20 2019 (r514865) @@ -1,6 +1,6 @@ -TIMESTAMP = 1571268603 -SHA256 (RPCS3-rpcs3-v0.0.7-8909-gcb362b408_GH0.tar.gz) = 0fe96755219b210e9bc921f06f9bbb90a5b25efb163c15310c0542b446e1417e -SIZE (RPCS3-rpcs3-v0.0.7-8909-gcb362b408_GH0.tar.gz) = 5617386 +TIMESTAMP = 1571505618 +SHA256 (RPCS3-rpcs3-v0.0.7-8941-g0ef7ad129_GH0.tar.gz) = daf9c83bc14d274c267cc110bdfe22d1e839eec6bfa0c9ba24d2d4eae279c857 +SIZE (RPCS3-rpcs3-v0.0.7-8941-g0ef7ad129_GH0.tar.gz) = 5625433 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 Added: head/emulators/rpcs3/files/extra-patch-revert-db7042b986ab ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/extra-patch-revert-db7042b986ab Sun Oct 20 00:48:20 2019 (r514865) @@ -0,0 +1,73 @@ +--- Utilities/sync.h.orig 2019-10-19 17:20:18 UTC ++++ Utilities/sync.h +@@ -24,8 +24,6 @@ + #include <unordered_map> + + #ifdef _WIN32 +-DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); +-DYNAMIC_IMPORT("ntdll.dll", NtReleaseKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); + DYNAMIC_IMPORT("ntdll.dll", NtWaitForSingleObject, NTSTATUS(HANDLE Handle, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); + DYNAMIC_IMPORT("ntdll.dll", NtDelayExecution, NTSTATUS(BOOLEAN Alertable, PLARGE_INTEGER DelayInterval)); + #endif +--- rpcs3/util/atomic.cpp.orig 2019-10-19 17:20:18 UTC ++++ rpcs3/util/atomic.cpp +@@ -59,7 +59,7 @@ static thread_local bool(*s_tls_wait_cb)(const void* d + #ifdef USE_POSIX + using sema_handle = sem_t; + #elif defined(_WIN32) +-using sema_handle = std::uint16_t; ++using sema_handle = HANDLE; + #else + namespace + { +@@ -119,7 +119,10 @@ static u32 sema_alloc() + // Initialize semaphore (should be very fast) + sem_init(&s_sema_list[id], 0, 0); + #elif defined(_WIN32) +- // Do nothing ++ if (!s_sema_list[id]) ++ { ++ s_sema_list[id] = CreateSemaphoreW(nullptr, 0, 0x7fff'ffff, nullptr); ++ } + #else + if (!s_sema_list[id]) + { +@@ -454,7 +457,7 @@ void atomic_storage_futex::wait(const void* data, std: + qw.QuadPart -= 1; + } + +- if (!NtWaitForKeyedEvent(nullptr, &s_sema_list[sema_id], false, timeout + 1 ? &qw : nullptr)) ++ if (!NtWaitForSingleObject(s_sema_list[sema_id], false, timeout + 1 ? &qw : nullptr)) + { + fallback = true; + } +@@ -569,7 +572,7 @@ void atomic_storage_futex::wait(const void* data, std: + #if defined(_WIN32) && !defined(USE_POSIX) + static LARGE_INTEGER instant{}; + +- if (!NtWaitForKeyedEvent(nullptr, &s_sema_list[sema_id], false, &instant)) ++ if (!NtWaitForSingleObject(s_sema_list[sema_id], false, &instant)) + { + fallback = true; + } +@@ -765,7 +768,7 @@ void atomic_storage_futex::notify_one(const void* data + #ifdef USE_POSIX + sem_post(&s_sema_list[sema_id]); + #elif defined(_WIN32) +- NtReleaseKeyedEvent(nullptr, &s_sema_list[sema_id], 1, nullptr); ++ ReleaseSemaphore(s_sema_list[sema_id], 1, nullptr); + #else + dumb_sema& sema = *s_sema_list[sema_id]; + +@@ -836,9 +839,9 @@ void atomic_storage_futex::notify_all(const void* data + sem_post(&s_sema_list[sema_id]); + } + #elif defined(_WIN32) +- for (u32 i = 0; i < count; i++) ++ if (count) + { +- NtReleaseKeyedEvent(nullptr, &s_sema_list[sema_id], count, nullptr); ++ ReleaseSemaphore(s_sema_list[sema_id], count, nullptr); + } + #else + if (count)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910200048.x9K0mKYf084435>