Date: Sat, 3 Jun 2023 00:46:31 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: 79d887648687 - 2023Q2 - emulators/rpcs3: update to 0.0.28 Message-ID: <202306030046.3530kVLd000852@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=79d8876486875d0a3467dbebbef03977c777c863 commit 79d8876486875d0a3467dbebbef03977c777c863 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-05 16:08:55 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-06-03 00:42:33 +0000 emulators/rpcs3: update to 0.0.28 Changes: https://github.com/RPCS3/rpcs3/releases/tag/v0.0.28 Changes: https://github.com/RPCS3/rpcs3/compare/842edbcbe7...33558d14e5 (cherry picked from commit 389754bdb28609a1f86a48b6605068477165b6d2) (cherry picked from commit e7f533b985f3b89db05af7c3f0108e70c4f3bf45) (cherry picked from commit be2c576b98296fb051f081bad078f6bd05b2106e) (cherry picked from commit 64b13c47ca95c9621c390ee2b22903b062676028) (cherry picked from commit 1d6fc251b2faa2b4d98412090aa5dbd863f3576d) (cherry picked from commit b8d38e85c2dd61e5efe299a6e7e41b3d6792473f) (cherry picked from commit 2b8122ec102c049d8ea378afee63fa74c843950d) (cherry picked from commit 505ef69b19fa94f8a1885af0b5c7f496c3e23a4b) (cherry picked from commit 14ef498a92127ce9f3da163aba451e1ea799b900) (cherry picked from commit 5f3bbcdf1239b91552effde94341e30597abad63) (cherry picked from commit 8993b454a4ea400d1b66097bcd3c1367f97260bf) (cherry picked from commit ab0f35a41c83bc779a56ff7dd94ece617d6ec785) (cherry picked from commit f3a1631e694f1279f3e8ec74ca3a6b65547cf83d) (cherry picked from commit 249bda1dc9eb4c1be7dc6155f430a4abb401184f) (cherry picked from commit 63d415897369284507fc015201df28a78b24428f) (cherry picked from commit 4e76c85311f90c112ee6f3246e177314ad3535e2) (cherry picked from commit 7d8caf2ea1816d85a9aed5d08b51fb7e4c894eb1) (cherry picked from commit b8c01c318e6201d8c1631343fdd54f585ab7418f) (cherry picked from commit ff288d949201c18cd5372bc28120425f7db3eece) (cherry picked from commit 4a373403f886b0738f41220ed93defe9961e25d5) (cherry picked from commit 5cb66ecdf1228deaa2c63d2ebf09a14ffd6e8bc7) (cherry picked from commit db3a8ea27e59bc6e8a9858efc55b91b67585bcbd) (cherry picked from commit d3c6b590beb056c426c8ed975d2cac666c838486) (cherry picked from commit 5f03b4a217acd566d72a9e469007fd2dcf106fa0) (cherry picked from commit 48c2fe40d3cfe38383e7fc6f491e310f57e3e146) (cherry picked from commit 8dbab8ea22d3514908df7a3ddb52a52e8e5d63bf) --- emulators/rpcs3/Makefile | 47 ++++++++++++++++++++++++----------------------- emulators/rpcs3/distinfo | 30 +++++++++++++++--------------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 0ab7b4e8342f..5e03c7548782 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,8 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.27-14840 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g842edbcbe7 -PORTREVISION= 1 +DISTVERSION= 0.0.28 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -15112-g33558d14e5 CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org @@ -28,19 +27,18 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 -GH_TUPLE= RPCS3:hidapi:hidapi-0.13.1-2-gecf1b62:hidapi/3rdparty/hidapi/hidapi \ - RPCS3:llvm-mirror:9b52b6c39ae9:llvm/llvm \ +GH_TUPLE= RPCS3:hidapi:hidapi-0.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \ RPCS3:soundtouch:2.3.1-16-g83cfba6:soundtouch/3rdparty/SoundTouch/soundtouch \ - asmjit:asmjit:06d0bad:asmjit/3rdparty/asmjit/asmjit \ + asmjit:asmjit:c598476: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.4.raytracing.fixed-187-g85a1ed2:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \ KhronosGroup:SPIRV-Tools:v2022.4:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \ KhronosGroup:glslang:11.11.0-2-g10423ec6:glslang/3rdparty/glslang/glslang \ kinetiknz:cubeb:cubeb-0.2-1425-g88585b6:cubeb/3rdparty/cubeb/cubeb \ - miniupnp:miniupnp:miniupnpd_2_3_2:miniupnp/3rdparty/miniupnp/miniupnp \ - wolfSSL:wolfssl:v5.5.4-stable:wolfssl/3rdparty/wolfssl/wolfssl + miniupnp:miniupnp:miniupnpd_2_3_3:miniupnp/3rdparty/miniupnp/miniupnp \ + wolfSSL:wolfssl:v5.6.0-stable:wolfssl/3rdparty/wolfssl/wolfssl -USES= cmake elfctl gl iconv:wchar_t localbase:ldflags \ +USES= cmake elfctl gl iconv:wchar_t llvm:min=16,lib 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 @@ -53,7 +51,7 @@ ELF_FEATURES= +noaslr,wxneeded:bin/${PORTNAME} .if ${FLAVOR:U} == qt6 || make(makesum) || make(fetch) PATCH_SITES+= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/:qt6 -PATCHFILES+= 98a2f373fd59.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471 +PATCHFILES+= c196f09833b4.patch:-p1:qt6 # https://github.com/RPCS3/rpcs3/pull/12471 PKGNAMESUFFIX= -${FLAVOR} USES:= ${USES:S/qt:5/qt:6/} USE_QT= base multimedia svg @@ -62,6 +60,9 @@ CONFLICTS_INSTALL= ${PORTNAME} post-patch: ${FLAVOR}-post-patch ${FLAVOR}-post-patch: +# XXX Drop after devel/qt6-base >= 6.5 update + @${REINPLACE_CMD} -e '/QT_MIN_VER/s/6\.5\.0/6.4.2/' \ + ${WRKSRC}/3rdparty/qt6.cmake # patch(1) doesn't support renames unlike git-apply(1) @${MV} ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_surface.cpp \ ${WRKSRC}/rpcs3/rpcs3qt/qt_camera_video_sink.cpp @@ -71,8 +72,8 @@ ${FLAVOR}-post-patch: CONFLICTS_INSTALL= ${PORTNAME}-qt6 .endif -OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN -OPTIONS_DEFAULT=EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN +OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO JACK SDL SNDIO VULKAN +OPTIONS_DEFAULT=EVDEV FAUDIO PULSEAUDIO JACK SDL SNDIO VULKAN ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA @@ -93,6 +94,10 @@ JACK_CMAKE_BOOL= USE_JACK PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE +SDL_USES= sdl +SDL_USE= SDL=sdl2 +SDL_CMAKE_BOOL= USE_SDL USE_SYSTEM_SDL + SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO @@ -101,21 +106,17 @@ VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-heade VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN +# XXX Unbundle audio/rtmidi +GH_TUPLE+= thestk:rtmidi:5.0.0:rtmidi/3rdparty/rtmidi/rtmidi +ALSA_LIB_DEPENDS+= libasound.so:audio/alsa-lib +ALSA_CMAKE_BOOL+= RTMIDI_API_ALSA +JACK_LIB_DEPENDS+= libjack.so:audio/jack +JACK_CMAKE_BOOL+= RTMIDI_API_JACK + post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/local_build/master/' \ -e '/GIT_FULL_BRANCH/s/local_build/${GH_ACCOUNT}\/${GH_PROJECT}\/master/' \ -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake -.include <bsd.port.options.mk> - -# XXX https://github.com/llvm/llvm-project/issues/58207 -.if ${_OSRELEASE:M*-CURRENT} -# Ignore Clang assertions -USES+= llvm -CC= clang${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -.endif - .include <bsd.port.mk> diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index d1ecff159417..e3ef3d521525 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,14 +1,12 @@ -TIMESTAMP = 1680271551 -SHA256 (RPCS3-rpcs3-v0.0.27-14840-g842edbcbe7_GH0.tar.gz) = af6200da67d5603741c98670a8a0f0d706aad91ed874f9f4ee81d307ed1d508d -SIZE (RPCS3-rpcs3-v0.0.27-14840-g842edbcbe7_GH0.tar.gz) = 8783120 -SHA256 (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = a45fdf93aeb913407f0e707769b3ee7ac58bef6d44e299065ea1df038261ac1c -SIZE (RPCS3-hidapi-hidapi-0.13.1-2-gecf1b62_GH0.tar.gz) = 245283 -SHA256 (RPCS3-llvm-mirror-9b52b6c39ae9_GH0.tar.gz) = 9df78a8282453a0e1a3653664ef11ef47b8ab4d2b86e486922770ed2240788b0 -SIZE (RPCS3-llvm-mirror-9b52b6c39ae9_GH0.tar.gz) = 29968896 +TIMESTAMP = 1685728447 +SHA256 (RPCS3-rpcs3-v0.0.28-15112-g33558d14e5_GH0.tar.gz) = 6f61a71c74eba748a5a50d1a233c90731df71770db7036ae5dbdcef06b9afc7e +SIZE (RPCS3-rpcs3-v0.0.28-15112-g33558d14e5_GH0.tar.gz) = 8850938 +SHA256 (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 109ba77362885d60e274930f637735ee75df2850fe99e3f1c3a5b9d1187f8cb6 +SIZE (RPCS3-hidapi-hidapi-0.14.0-2-g8b43a97_GH0.tar.gz) = 348879 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-06d0bad_GH0.tar.gz) = e48728f90c17ddd785b2a94489bd0396dffe086195fc046b547619b2fd363e3c -SIZE (asmjit-asmjit-06d0bad_GH0.tar.gz) = 972948 +SHA256 (asmjit-asmjit-c598476_GH0.tar.gz) = 02ecb6475405bf103d4b85a4c75d29e8d78fbc16e4ed134248bcb6fa52db8503 +SIZE (asmjit-asmjit-c598476_GH0.tar.gz) = 973256 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.4.raytracing.fixed-187-g85a1ed2_GH0.tar.gz) = 2a8b49657434cbb96c20e0c1558a70d32fc8eadf80e1d611c73ff721fb3d8212 @@ -19,9 +17,11 @@ SHA256 (KhronosGroup-glslang-11.11.0-2-g10423ec6_GH0.tar.gz) = 444052c288ee2507f SIZE (KhronosGroup-glslang-11.11.0-2-g10423ec6_GH0.tar.gz) = 3543809 SHA256 (kinetiknz-cubeb-cubeb-0.2-1425-g88585b6_GH0.tar.gz) = d10bf2d54d7202efa39ac10bc580048666d6e7a5019a5d1f0f71e8b7bf01f25c SIZE (kinetiknz-cubeb-cubeb-0.2-1425-g88585b6_GH0.tar.gz) = 226777 -SHA256 (miniupnp-miniupnp-miniupnpd_2_3_2_GH0.tar.gz) = 3b8567490c50e698b91c657c5eada79d05de7d18c266bb600371707643d0ce3c -SIZE (miniupnp-miniupnp-miniupnpd_2_3_2_GH0.tar.gz) = 455225 -SHA256 (wolfSSL-wolfssl-v5.5.4-stable_GH0.tar.gz) = b7ee150e49def77c765bc02aac92ddeb0bebefd4cb12aa263d8f95e405221fb8 -SIZE (wolfSSL-wolfssl-v5.5.4-stable_GH0.tar.gz) = 19288452 -SHA256 (98a2f373fd59.patch) = 22535803eca460d45607c303f66db085f59bbe07f1e23509b5e097ed25ad3dae -SIZE (98a2f373fd59.patch) = 103152 +SHA256 (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 166277d9c1b8d8241cc6bfaa0b4b22c033bbac7f2848709685d8bfdf97778af4 +SIZE (miniupnp-miniupnp-miniupnpd_2_3_3_GH0.tar.gz) = 454853 +SHA256 (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = c1e689e21a17aa9b838e67a37c3eadfa578c8e260f8c77fb028c0316309f0636 +SIZE (wolfSSL-wolfssl-v5.6.0-stable_GH0.tar.gz) = 21998970 +SHA256 (thestk-rtmidi-5.0.0_GH0.tar.gz) = c7923e4eee82b06c007435892cb2c3212d9007fa482c6b718943bda71c02c5a7 +SIZE (thestk-rtmidi-5.0.0_GH0.tar.gz) = 103144 +SHA256 (c196f09833b4.patch) = 87b02da248a2ff4d9e41fcc61ca6559d648e67a3fe34ac01e0b02253b5ed90c1 +SIZE (c196f09833b4.patch) = 113465
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306030046.3530kVLd000852>