svn commit: r507929 - head/emulators/rpcs3

[Jan Beich]

Author: jbeich
Date: Sat Aug  3 00:57:50 2019
New Revision: 507929
URL: https://svnweb.freebsd.org/changeset/ports/507929

Log:
  emulators/rpcs3: back out r507922 due to bustage on 11.2/12.0
  
  - Broken with libc++ 6 and there's not enough time before the next bulk build.
  - PORTEPOCH isn't necessary as if built it's good, and the update will return
  
  rpcs3/util/atomic.cpp:55:51: error: no type named 'node_type' in 'std::__1::multimap<const void *, (anonymous namespace)::waiter, std::__1::less<const void *>, std::__1::allocator<std::__1::pair<const void *const, (anonymous namespace)::waiter> > >'; did you mean 'size_type'?
          thread_local std::multimap<const void*, waiter>::node_type s_tls_waiter = []()
                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
                                                           size_type
  /usr/include/c++/v1/map:1507:60: note: 'size_type' declared here
      typedef typename __alloc_traits::size_type             size_type;
                                                             ^
  rpcs3/util/atomic.cpp:59:16: error: no member named 'extract' in 'std::__1::multimap<const void *, (anonymous namespace)::waiter, std::__1::less<const void *>, std::__1::allocator<std::__1::pair<const void *const, (anonymous namespace)::waiter> > >'
                  return dummy.extract(dummy.emplace(nullptr, &s_tls_waiter));
                         ~~~~~ ^
  rpcs3/util/atomic.cpp:55:61: error: cannot initialize a variable of type 'std::multimap<const void *, waiter>::size_type' (aka 'unsigned long') with an rvalue of type 'void'
          thread_local std::multimap<const void*, waiter>::node_type s_tls_waiter = []()
                                                                     ^              ~~~~
  rpcs3/util/atomic.cpp:92:69: error: no type named 'node_type' in 'std::__1::multimap<const void *, (anonymous namespace)::waiter, std::__1::less<const void *>, std::__1::allocator<std::__1::pair<const void *const, (anonymous namespace)::waiter> > >'; did you mean 'size_type'?
                  const auto ptls = static_cast<std::multimap<const void*, waiter>::node_type*>(found->second.tls_ptr);
                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~
                                                                                    size_type
  /usr/include/c++/v1/map:1507:60: note: 'size_type' declared here
      typedef typename __alloc_traits::size_type             size_type;
                                                             ^
  rpcs3/util/atomic.cpp:93:21: error: no member named 'extract' in 'std::__1::multimap<const void *, (anonymous namespace)::waiter, std::__1::less<const void *>, std::__1::allocator<std::__1::pair<const void *const, (anonymous namespace)::waiter> > >'
                  *ptls = wmap.list.extract(found);
                          ~~~~~~~~~ ^
  rpcs3/util/atomic.cpp:94:7: error: member reference base type 'unsigned long' is not a structure or union
                  ptls->mapped().cond.notify_one();
                  ~~~~^ ~~~~~~
  6 errors generated.

Modified:
  head/emulators/rpcs3/Makefile   (contents, props changed)
  head/emulators/rpcs3/distinfo   (contents, props changed)

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Sat Aug  3 00:50:08 2019	(r507928)
+++ head/emulators/rpcs3/Makefile	Sat Aug  3 00:57:50 2019	(r507929)
@@ -2,8 +2,8 @@
 
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.6-8439 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g5bd17a44c
+DISTVERSION=	0.0.6-8435 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-ge40b76b25
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich at FreeBSD.org

Modified: head/emulators/rpcs3/distinfo
==============================================================================
--- head/emulators/rpcs3/distinfo	Sat Aug  3 00:50:08 2019	(r507928)
+++ head/emulators/rpcs3/distinfo	Sat Aug  3 00:57:50 2019	(r507929)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1564760243
-SHA256 (RPCS3-rpcs3-v0.0.6-8439-g5bd17a44c_GH0.tar.gz) = 559c905efe6c6a5fe96dc217e787806f6126cee6befc268d54209834bf1f3834
-SIZE (RPCS3-rpcs3-v0.0.6-8439-g5bd17a44c_GH0.tar.gz) = 5531830
+TIMESTAMP = 1564426684
+SHA256 (RPCS3-rpcs3-v0.0.6-8435-ge40b76b25_GH0.tar.gz) = 6a4eaceb45c42a4dd55956fb00f051ee5aa5d74e18834732885b3a9d8f863043
+SIZE (RPCS3-rpcs3-v0.0.6-8435-ge40b76b25_GH0.tar.gz) = 5531115
 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