From nobody Thu Feb 03 00:51:31 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BAFA919892BE; Thu, 3 Feb 2022 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jq0VC3cdpz4rCM; Thu, 3 Feb 2022 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643849491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nnN2ub2opXs0NgRueAsOBZrTLB1zBT7LTvGl6Et1Zso=; b=GjYUJgqTuwJRvfWm4HfnNXwM/1JI4FSwORJkKu56Qusxkil2JZ9BHr9hkusNT5qW61kxLS 2aq+kF64cet0FRGV4ojHa3swpcz7i421hdFbF3FO6D2YNTqwA6y4NWotbg1sRe9WpDA0o+ EuUZzjgiq5pLvd2vY4H/6l85ar82eCPvKVxosvoV+t0hDFbQB5bpMFP4tjvhZJpFjWEUeP 8J50nRtfO/TWpTfK60fLDnVnAEFMgW9zN2lqNaryPbJiqqE84eSrCAw/Au8eeRRUs21f6v DU47Lc4VRZhT4B5lSzpNleoN6O/su4Xe9h16SM2mgikctmlD47o98aLGbzsx/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58D5461C3; Thu, 3 Feb 2022 00:51:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2130pVme037560; Thu, 3 Feb 2022 00:51:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2130pVpo037559; Thu, 3 Feb 2022 00:51:31 GMT (envelope-from git) Date: Thu, 3 Feb 2022 00:51:31 GMT Message-Id: <202202030051.2130pVpo037559@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 3331cf020ee6 - main - emulators/rpcs3: update to 0.0.20.13251 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3331cf020ee66c96edd2c59ae208b8911ef646cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643849491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nnN2ub2opXs0NgRueAsOBZrTLB1zBT7LTvGl6Et1Zso=; b=fHBDsdNTkhn70IcCv7Iz4ss6xYu8OUk6PYDrPw4pQYKuMs8h6KtnGSIgqlLSWKjxaWi7co 9t99roeP6bllR+5xTz+8ysdsZp7H2d65hTU1iiKvNPsSza+sH844NKWxNZEMO+HM1hDueW n+R7W0FBmfgQIwCSl50pbyV1tACd/NK5gYSXUEpbLi9OaWsgydREYxsoFw1AatQnPqIrvw 31TCdzdNTTIHKSeEc75zdo9AT2uEZClDAd5Wsg3f7DKBwT+drHcBc7QppLVQzxR10TGb36 LQz6Uh//lplLbxT/OjQVBnJYBp7X0nrKHks56tWw7cQxuvuYCuzAKdMR+A/AVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643849491; a=rsa-sha256; cv=none; b=T/GieC1R+J8aHNO6dJWsm0nbXt2KIhA88kxMqDt/+gQZvVHo+a62TWlN/awtBm5oYLa4sA eCYdE8UWpmD565DJVZQpSJgAl+JSV0U1xGXAwe7cA6lDiJq7fjjyOECS3EPJvgl6vhrE5w 9ueRNWsL+0IcQOxiDoLXw3HN2UiVLMr1BsYfy7tyxz0rYh0uzKxcsdW/1YtHvAhnGjwxFV 6n3UMKF4HvFxVm3gxEqY5PoN6mApda4KXMaWsViBWpLqJL+nl4QBlalQ/C7fJQRHmNDzBJ odCJpHiKM/dLq9Qg8xBC2jURW9C56p0Fytc4gLfphQlDfo3gJOkXuGREyioMFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3331cf020ee66c96edd2c59ae208b8911ef646cf commit 3331cf020ee66c96edd2c59ae208b8911ef646cf Author: Jan Beich AuthorDate: 2022-01-31 20:20:57 +0000 Commit: Jan Beich CommitDate: 2022-02-03 00:51:17 +0000 emulators/rpcs3: update to 0.0.20.13251 Changes: https://github.com/RPCS3/rpcs3/compare/781b2b454...fd0e7a4ef --- emulators/rpcs3/Makefile | 7 ++++--- emulators/rpcs3/distinfo | 12 +++++++----- emulators/rpcs3/files/patch-soundtouch | 25 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 18d1f2f1fab6..e24e83252603 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.20-13240 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g781b2b454 +DISTVERSION= 0.0.20-13251 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -gfd0e7a4ef CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -26,12 +26,13 @@ USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.11.2-4-g6cf1336:hidapi/3rdparty/hidapi/hidapi \ RPCS3:llvm-mirror:509d31ad8967:llvm/llvm \ + RPCS3:soundtouch:2.3.1-16-g83cfba6:soundtouch/3rdparty/SoundTouch/soundtouch \ asmjit:asmjit:fc2a5d8:asmjit/3rdparty/asmjit/asmjit \ jbeder:yaml-cpp:yaml-cpp-0.7.0-1-g0b67821:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \ KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \ KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \ KhronosGroup:glslang:11.7.1:glslang/3rdparty/glslang/glslang \ - kinetiknz:cubeb:cubeb-0.2-1345-g773f16b:cubeb/3rdparty/cubeb/cubeb \ + kinetiknz:cubeb:cubeb-0.2-1350-gf79e0cf:cubeb/3rdparty/cubeb/cubeb \ wolfSSL:wolfssl:v5.1.0-stable-47-g4bbf90d60:wolfssl/3rdparty/wolfssl/wolfssl USES= cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \ diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index c5c13196e0ed..95502e90f227 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,10 +1,12 @@ -TIMESTAMP = 1643483448 -SHA256 (RPCS3-rpcs3-v0.0.20-13240-g781b2b454_GH0.tar.gz) = 224d46c4b8d712a40a86763234c2f0a1fcad590f0dd48fdd2c246fc69ae9b43d -SIZE (RPCS3-rpcs3-v0.0.20-13240-g781b2b454_GH0.tar.gz) = 8260622 +TIMESTAMP = 1643746902 +SHA256 (RPCS3-rpcs3-v0.0.20-13251-gfd0e7a4ef_GH0.tar.gz) = 86998267ae190a0c091a2f962ad0725b1a2d2564e1ae7fd75624a6c7f5f26c9b +SIZE (RPCS3-rpcs3-v0.0.20-13251-gfd0e7a4ef_GH0.tar.gz) = 8263774 SHA256 (RPCS3-hidapi-hidapi-0.11.2-4-g6cf1336_GH0.tar.gz) = 9f14a553b65008221b8c343d45a73d3c10da512e05cefecd5cc1ceacb32430c4 SIZE (RPCS3-hidapi-hidapi-0.11.2-4-g6cf1336_GH0.tar.gz) = 233659 SHA256 (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 82a62696fb4a24187ed50146edfba3e587aa7ec3c809e644e0d69a530f06e6f3 SIZE (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 29967699 +SHA256 (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 56863dbed27510742ed4ced54e9a5fba8658bcbfbb1cc5cdb978d7d537a3a874 +SIZE (RPCS3-soundtouch-2.3.1-16-g83cfba6_GH0.tar.gz) = 524625 SHA256 (asmjit-asmjit-fc2a5d8_GH0.tar.gz) = e4550efadfbc0f35ca7eecf099d3b8afff764bb4808061ee20aeb2637562f5c0 SIZE (asmjit-asmjit-fc2a5d8_GH0.tar.gz) = 963573 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.7.0-1-g0b67821_GH0.tar.gz) = 97ed209bb218153ba1cd8096e4d259e559ce7119bfc93013fc843c83651047ae @@ -15,8 +17,8 @@ SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982 SHA256 (KhronosGroup-glslang-11.7.1_GH0.tar.gz) = ab2e2ddc507bb418b9227cbe6f443eb06e89e2387944f42026d82c0b4ef79b0a SIZE (KhronosGroup-glslang-11.7.1_GH0.tar.gz) = 3426303 -SHA256 (kinetiknz-cubeb-cubeb-0.2-1345-g773f16b_GH0.tar.gz) = f32cef6db43124d847690ce45f56bf5fe2da057d8f0df909517490430434302b -SIZE (kinetiknz-cubeb-cubeb-0.2-1345-g773f16b_GH0.tar.gz) = 220225 +SHA256 (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 8629757290774a34ed3fcd53b6491e9ccc96231018406c58c493f336b3ced908 +SIZE (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 220847 SHA256 (wolfSSL-wolfssl-v5.1.0-stable-47-g4bbf90d60_GH0.tar.gz) = ec415fba7c5c3ae40893f886a528e205dc5523caa840149ef9db4efab966357c SIZE (wolfSSL-wolfssl-v5.1.0-stable-47-g4bbf90d60_GH0.tar.gz) = 11102581 SHA256 (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = c9411f1882eaf0c190fd5b412deb0bd7dba61a48df243d3408298cc6f53b6921 diff --git a/emulators/rpcs3/files/patch-soundtouch b/emulators/rpcs3/files/patch-soundtouch new file mode 100644 index 000000000000..cc365709e724 --- /dev/null +++ b/emulators/rpcs3/files/patch-soundtouch @@ -0,0 +1,25 @@ +In file included from rpcs3/Emu/Audio/audio_device_listener.cpp:5: +In file included from rpcs3/Emu/Cell/Modules/cellAudio.h:9: +In file included from rpcs3/Emu/Audio/audio_resampler.h:10: +In file included from 3rdparty/SoundTouch/soundtouch/include/SoundTouch.h:68: +3rdparty/SoundTouch/soundtouch/include/FIFOSamplePipe.h:62:9: error: use of old-style cast [-Werror,-Wold-style-cast] + ST_THROW_RT_ERROR("Error: Illegal number of channels"); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +3rdparty/SoundTouch/soundtouch/include/STTypes.h:128:45: note: expanded from macro 'ST_THROW_RT_ERROR' + #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} + ^ ~ +/usr/include/assert.h:56:21: note: expanded from macro 'assert' +#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ + ^ + +--- 3rdparty/SoundTouch/soundtouch/include/STTypes.h.orig 2022-01-22 12:50:46 UTC ++++ 3rdparty/SoundTouch/soundtouch/include/STTypes.h +@@ -125,7 +125,7 @@ namespace soundtouch + #ifdef ST_NO_EXCEPTION_HANDLING + // Exceptions disabled. Throw asserts instead if enabled. + #include +- #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} ++ #define ST_THROW_RT_ERROR(x) {assert(static_cast(x));} + #else + // use c++ standard exceptions + #include