git: 1c2d7e46de23 - main - emulators/rpcs3: update to 0.0.16.12386

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c2d7e46de2312635f7845b14ae5de4445ea99a2

commit 1c2d7e46de2312635f7845b14ae5de4445ea99a2
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-06-09 07:55:55 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-06-10 00:59:46 +0000

    emulators/rpcs3: update to 0.0.16.12386
    
    Changes:        https://github.com/RPCS3/rpcs3/compare/2169e8d93...2dc6adc03
---
 emulators/rpcs3/Makefile                              |  6 +++---
 emulators/rpcs3/distinfo                              | 10 +++++-----
 .../rpcs3/files/patch-3rdparty_hidapi_libusb_hid.c    | 19 -------------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index 63d74d9533da..27926463f6fb 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.16-12375 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g2169e8d93
+DISTVERSION=	0.0.16-12386 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-g2dc6adc03
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
-GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-28-g8961cf8:hidapi/3rdparty/hidapi/hidapi \
+GH_TUPLE=	RPCS3:hidapi:hidapi-0.8.0-rc1-125-g01f601a:hidapi/3rdparty/hidapi/hidapi \
 		RPCS3:llvm-mirror:5836324d6443:llvm/llvm \
 		Cyan4973:xxHash:v0.8.0:xxHash/3rdparty/xxHash \
 		FNA-XNA:FAudio:21.04:FAudio/3rdparty/FAudio \
diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo
index 326ebcf6aafb..f2ecbb733363 100644
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1623072522
+TIMESTAMP = 1623277444
 SHA256 (libcxx-12.0.0.src.tar.xz) = 7dcb75ca4f6aae2c677d128460c48a57398c8b6791b77b74bea7cf9e04e7c3f1
 SIZE (libcxx-12.0.0.src.tar.xz) = 1880864
-SHA256 (RPCS3-rpcs3-v0.0.16-12375-g2169e8d93_GH0.tar.gz) = b218d5293413bbab3f8c112436523488e58031883deeadfb4304b98dc9cfb06f
-SIZE (RPCS3-rpcs3-v0.0.16-12375-g2169e8d93_GH0.tar.gz) = 8065133
-SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 0f0f3b3af2fff7004f479a1adbbb81658b62a2e07b5978acc65833273e8124d7
-SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 105391
+SHA256 (RPCS3-rpcs3-v0.0.16-12386-g2dc6adc03_GH0.tar.gz) = e447935ef4d1daa1f3ff461e3415387e6b147f47ae182fa55698112fc35b3f82
+SIZE (RPCS3-rpcs3-v0.0.16-12386-g2dc6adc03_GH0.tar.gz) = 8065690
+SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = d6aecf7a9e4d6f4935f1da5fd29cb8011f76567c8e5b571b7410e2fa6942bf37
+SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-125-g01f601a_GH0.tar.gz) = 120327
 SHA256 (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = b996a126f5d1beb558d63fb79005cf193c591cf8787dd86bcdb1f289f817e964
 SIZE (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = 27243918
 SHA256 (Cyan4973-xxHash-v0.8.0_GH0.tar.gz) = 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f
diff --git a/emulators/rpcs3/files/patch-3rdparty_hidapi_libusb_hid.c b/emulators/rpcs3/files/patch-3rdparty_hidapi_libusb_hid.c
deleted file mode 100644
index 4c8807f53b15..000000000000
--- a/emulators/rpcs3/files/patch-3rdparty_hidapi_libusb_hid.c
+++ /dev/null
@@ -1,19 +0,0 @@
-3rdparty/hidapi/libusb/hid.c:458:18: warning: passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]
-        res = iconv(ic, &inptr, &inbytes, &outptr, &outbytes);
-                        ^~~~~~
-/usr/local/include/iconv.h:85:43: note: passing argument to parameter 'inbuf' here
-extern size_t iconv (iconv_t cd,  char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
-                                          ^
-1 warning generated.
-
---- 3rdparty/hidapi/hidapi/libusb/hid.c.orig	2020-11-17 12:05:32 UTC
-+++ 3rdparty/hidapi/hidapi/libusb/hid.c
-@@ -397,7 +397,7 @@ static wchar_t *get_usb_string(libusb_device_handle *d
- 	size_t inbytes;
- 	size_t outbytes;
- 	size_t res;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && __FreeBSD__ < 10
- 	const char *inptr;
- #else
- 	char *inptr;