Date: Tue, 1 Mar 2022 00:54:14 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 9df9f71817d1 - 2022Q1 - emulators/rpcs3: update to 0.0.21 Message-ID: <202203010054.2210sEVE040507@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9df9f71817d14638c93a073e80aada7e86db5ce7 commit 9df9f71817d14638c93a073e80aada7e86db5ce7 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-03 02:33:20 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-03-01 00:52:05 +0000 emulators/rpcs3: update to 0.0.21 - unbundle more libs except wolfssl Changes: https://github.com/RPCS3/rpcs3/releases/tag/v0.0.21 (cherry picked from commit a9009c8310a6b17b913f644fd0699af990025275) (cherry picked from commit 2fd0f09b4bab705f7e4b9dd975743dce0230f38d) (cherry picked from commit dea161ae924e5479be3c8ccad0529033f9d8066c) (cherry picked from commit 4a07927457ed266f62b9e6a4c041647b08c6ef4a) (cherry picked from commit cf3b1c715fe717c61eb94dafa486a7dfc42d37f1) (cherry picked from commit 6c831d8ed484697ba349edb3f01b62e11fd8881d) (cherry picked from commit 66e5089f6d0d4243693bfe98e3281c9b6d670f78) (cherry picked from commit 3f3a3ce945b01701fc0e1787848db48143b31d7d) (cherry picked from commit c5ee1236c6ac38faa40f102ef960089d2d21aaaa) (cherry picked from commit b44391dd2db4bcc37176331f734c6ed1fd9d57fa) (cherry picked from commit 814fc6db724aaffbeab394a2a7591d5bf01bc7b5) (cherry picked from commit 2f73f6fdb6127c856800381caf1d34323cebd8c1) (cherry picked from commit fea4cd7cd37e4fc3b6e1547f61dbdacd246cc1eb) (cherry picked from commit 7c6de06c358f12675910ad129150e2babd547c3b) (cherry picked from commit 3331cf020ee66c96edd2c59ae208b8911ef646cf) (cherry picked from commit dda248642909d734d2a6cf7756ff22fe280234db) (cherry picked from commit 1a2b19f473ccd90bcdcbdc8e52971d63b460b6ab) (cherry picked from commit bb4161021fce52d1da8f3472d0ba38dc404dd487) (cherry picked from commit da1733ead4a4301c12a836e6b0b97c9ed5e4df29) (cherry picked from commit 824733f116103a9128af35e613e5985722b5f05f) (cherry picked from commit 20bff332d3b010b82b241d90151aa62c93584d6f) (cherry picked from commit fc478de26186147a23f3850325c3c522c0e5810c) (cherry picked from commit cd64206c9bbff95591ac5eb5c771d20174b12008) (cherry picked from commit 8ae460348939023fca527592dbfbeb4e74146e26) (cherry picked from commit 8c889c8ccecc18310df87ac226d66d9f2663aa2c) --- emulators/rpcs3/Makefile | 30 +++++++++++++++--------------- emulators/rpcs3/distinfo | 34 +++++++++++++++------------------- emulators/rpcs3/files/patch-soundtouch | 25 +++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 34 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 3eb2b4cae1f2..48b2bfaa91ca 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.20 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -13138-g61d985263 +DISTVERSION= 0.0.21 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -13326-ga8e62e1bc1 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -10,37 +10,37 @@ COMMENT= PS3 emulator/debugger LICENSE= APACHE20 ISCL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC_cubeb}/LICENSE -LICENSE_FILE_MIT= ${WRKSRC_pugixml}/LICENSE.md LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md -LIB_DEPENDS= libcurl.so:ftp/curl \ +BUILD_DEPENDS= flatbuffers>0:devel/flatbuffers +LIB_DEPENDS= libxxhash.so:devel/xxhash \ + libcurl.so:ftp/curl \ libpng.so:graphics/png \ - libavcodec.so:multimedia/ffmpeg + libavcodec.so:multimedia/ffmpeg \ + libpugixml.so:textproc/pugixml -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 -GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-125-g01f601a:hidapi/3rdparty/hidapi/hidapi \ - RPCS3:llvm-mirror:1c0ca194dc50:llvm/llvm \ - Cyan4973:xxHash:v0.8.1:xxHash/3rdparty/xxHash \ - asmjit:asmjit:eae7197:asmjit/3rdparty/asmjit/asmjit \ - google:flatbuffers:v2.0.0:flatbuffers/3rdparty/flatbuffers \ +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 \ - wolfSSL:wolfssl:v4.8.1-stable:wolfssl/3rdparty/wolfssl/wolfssl \ - zeux:pugixml:v1.11.4:pugixml/3rdparty/pugixml + 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 \ openal:soft pkgconfig python:3.4+,build qt:5 xorg USE_GL= gl glew USE_QT= qmake_build buildtools_build core concurrent dbus gui multimedia svg widgets USE_XORG= x11 -CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG +CMAKE_ON= CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^/USE_SYSTEM_/} CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 5cba85afbdf3..242d55dbe0ba 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,16 +1,14 @@ -TIMESTAMP = 1640997134 -SHA256 (RPCS3-rpcs3-v0.0.20-13138-g61d985263_GH0.tar.gz) = 5a52231ebbc50f7e23be19a12b3b6e2233ee58541eb8ee75926a3326ff7908a3 -SIZE (RPCS3-rpcs3-v0.0.20-13138-g61d985263_GH0.tar.gz) = 8165629 -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-1c0ca194dc50_GH0.tar.gz) = 72236aa635277675c5f055b7891c0c650a476a1419dffbea9555a2f2a7ed02ee -SIZE (RPCS3-llvm-mirror-1c0ca194dc50_GH0.tar.gz) = 29966030 -SHA256 (Cyan4973-xxHash-v0.8.1_GH0.tar.gz) = 3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c -SIZE (Cyan4973-xxHash-v0.8.1_GH0.tar.gz) = 171552 -SHA256 (asmjit-asmjit-eae7197_GH0.tar.gz) = 62abab2d80c55d68e6f3f32d06d09a601e1248c823cba12e239508efb0ad4d43 -SIZE (asmjit-asmjit-eae7197_GH0.tar.gz) = 963330 -SHA256 (google-flatbuffers-v2.0.0_GH0.tar.gz) = 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4 -SIZE (google-flatbuffers-v2.0.0_GH0.tar.gz) = 1538022 +TIMESTAMP = 1646090989 +SHA256 (RPCS3-rpcs3-v0.0.21-13326-ga8e62e1bc1_GH0.tar.gz) = 70f1140ea768efd2e60c00bea768b27718a8651d47dd3c1bdc8e84de28e2133b +SIZE (RPCS3-rpcs3-v0.0.21-13326-ga8e62e1bc1_GH0.tar.gz) = 8280857 +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 SIZE (jbeder-yaml-cpp-yaml-cpp-0.7.0-1-g0b67821_GH0.tar.gz) = 1033619 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd @@ -19,11 +17,9 @@ 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 (wolfSSL-wolfssl-v4.8.1-stable_GH0.tar.gz) = 50db45f348f47e00c93dd244c24108220120cb3cc9d01434789229c32937c444 -SIZE (wolfSSL-wolfssl-v4.8.1-stable_GH0.tar.gz) = 10467737 -SHA256 (zeux-pugixml-v1.11.4_GH0.tar.gz) = 017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade -SIZE (zeux-pugixml-v1.11.4_GH0.tar.gz) = 566750 +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 SIZE (llvm-llvm-project-llvmorg-13.0.1-rc1_GH0.tar.gz) = 147284646 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 <assert.h> +- #define ST_THROW_RT_ERROR(x) {assert((const char *)x);} ++ #define ST_THROW_RT_ERROR(x) {assert(static_cast<const char *>(x));} + #else + // use c++ standard exceptions + #include <stdexcept>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203010054.2210sEVE040507>