diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index bfed62024596..dca7fd14148b 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,108 +1,108 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.36 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -17723-g2f8ed1a6bd +DISTVERSION= 0.0.36-17959 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -gb54c2124cf CATEGORIES= emulators wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger WWW= https://rpcs3.net/ LICENSE= APACHE20 ISCL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC_cubeb}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md BUILD_DEPENDS= flatc:devel/flatbuffers LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libpugixml.so:textproc/pugixml 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.14.0-2-g8b43a97:hidapi/3rdparty/hidapi/hidapi \ - RPCS3:soundtouch:2.3.1-68-g394e1f5:soundtouch/3rdparty/SoundTouch/soundtouch \ + RPCS3:soundtouch:2.3.1-78-g3982730:soundtouch/3rdparty/SoundTouch/soundtouch \ asmjit:asmjit:416f735:asmjit/3rdparty/asmjit/asmjit \ facebook:zstd:v1.5.7:zstd/3rdparty/zstd/zstd \ jbeder:yaml-cpp:0.8.0-11-g456c68f:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \ - KhronosGroup:glslang:13.1.1:glslang/3rdparty/glslang/glslang \ + KhronosGroup:glslang:15.3.0:glslang/3rdparty/glslang/glslang \ kcat:openal-soft:1.23.1:openal_soft/3rdparty/OpenAL/openal-soft \ kinetiknz:cubeb:cubeb-0.2-1425-g88585b6:cubeb/3rdparty/cubeb/cubeb \ - Megamouse:VulkanMemoryAllocator:3706484:vkalloc/3rdparty/GPUOpen/VulkanMemoryAllocator \ - miniupnp:miniupnp:miniupnpd_2_3_6:miniupnp/3rdparty/miniupnp/miniupnp \ + Megamouse:VulkanMemoryAllocator:1d8f600:vkalloc/3rdparty/GPUOpen/VulkanMemoryAllocator \ + miniupnp:miniupnp:miniupnpd_2_3_9:miniupnp/3rdparty/miniupnp/miniupnp \ nothings:stb:013ac3b:stb/3rdparty/stblib/stb \ - wolfSSL:wolfssl:v5.7.6-stable:wolfssl/3rdparty/wolfssl/wolfssl \ + wolfSSL:wolfssl:v5.8.0-stable:wolfssl/3rdparty/wolfssl/wolfssl \ xioTechnologies:Fusion:v1.2.8:fusion/3rdparty/fusion/fusion USES= cmake gl iconv:wchar_t llvm:min=19,lib localbase:ldflags \ openal:soft pkgconfig python:build qt:6 xorg USE_GL= gl glew USE_QT= base multimedia svg USE_XORG= x11 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 OPTIONS_DEFINE= ALSA EVDEV FAUDIO JACK LTO OPENCV PULSEAUDIO SDL SNDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO JACK LTO OPENCV PULSEAUDIO SDL SNDIO VULKAN ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA EVDEV_DESC= libevdev-based joystick support EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd FAUDIO_DESC= FAudio audio support FAUDIO_LIB_DEPENDS= libFAudio.so:audio/faudio@sdl3 FAUDIO_CMAKE_BOOL= USE_FAUDIO USE_SYSTEM_FAUDIO JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK LTO_CMAKE_BOOL= USE_LTO OPENCV_LIB_DEPENDS= libopencv_imgproc.so:graphics/opencv OPENCV_CMAKE_BOOL= USE_SYSTEM_OPENCV PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE SDL_USES= sdl SDL_USE= SDL=sdl3 SDL_CMAKE_BOOL= USE_SDL USE_SYSTEM_SDL SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN # XXX Unbundle audio/rtmidi GH_TUPLE+= thestk:rtmidi:6.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 post-install: .if exists(/usr/bin/elfctl) ${ELFCTL} -e +wxneeded ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .endif .include diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 63825cfc9737..bc2a27e9c99e 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,31 +1,31 @@ -TIMESTAMP = 1743363932 -SHA256 (RPCS3-rpcs3-v0.0.36-17723-g2f8ed1a6bd_GH0.tar.gz) = a709ae993c6837a818b258a587ca4d5979eb205f77f52b8c95178115d6176462 -SIZE (RPCS3-rpcs3-v0.0.36-17723-g2f8ed1a6bd_GH0.tar.gz) = 6981719 +TIMESTAMP = 1747835471 +SHA256 (RPCS3-rpcs3-v0.0.36-17959-gb54c2124cf_GH0.tar.gz) = d528bcbcd7ca561d87a4a364caa8e964991422686756038a46bdcb562c8c6d8d +SIZE (RPCS3-rpcs3-v0.0.36-17959-gb54c2124cf_GH0.tar.gz) = 5856504 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-68-g394e1f5_GH0.tar.gz) = e24af82c51547341e2dfd43af03c1847abfd8d27334d667e6a51943f7f505cbe -SIZE (RPCS3-soundtouch-2.3.1-68-g394e1f5_GH0.tar.gz) = 606828 +SHA256 (RPCS3-soundtouch-2.3.1-78-g3982730_GH0.tar.gz) = 68119ffee94c7eb2e12357599d7a47ec5cb029a89243daafb9ffad3fdfb433e9 +SIZE (RPCS3-soundtouch-2.3.1-78-g3982730_GH0.tar.gz) = 607859 SHA256 (asmjit-asmjit-416f735_GH0.tar.gz) = 65ba9c3487da09af02db0c34405d1bdd3e49e134062930777f272007d97940fd SIZE (asmjit-asmjit-416f735_GH0.tar.gz) = 1151444 SHA256 (facebook-zstd-v1.5.7_GH0.tar.gz) = 37d7284556b20954e56e1ca85b80226768902e2edabd3b649e9e72c0c9012ee3 SIZE (facebook-zstd-v1.5.7_GH0.tar.gz) = 2451884 SHA256 (jbeder-yaml-cpp-0.8.0-11-g456c68f_GH0.tar.gz) = 3793d936474b1e6366f934f128f168dae711fd5e248dac048226c7879cefd6a3 SIZE (jbeder-yaml-cpp-0.8.0-11-g456c68f_GH0.tar.gz) = 1018173 -SHA256 (KhronosGroup-glslang-13.1.1_GH0.tar.gz) = 1c4d0a5a38c8aaf89a2d7e6093be734320599f5a6775b2726beeb05b0c054e66 -SIZE (KhronosGroup-glslang-13.1.1_GH0.tar.gz) = 3763210 +SHA256 (KhronosGroup-glslang-15.3.0_GH0.tar.gz) = c6c21fe1873c37e639a6a9ac72d857ab63a5be6893a589f34e09a6c757174201 +SIZE (KhronosGroup-glslang-15.3.0_GH0.tar.gz) = 4023163 SHA256 (kcat-openal-soft-1.23.1_GH0.tar.gz) = dfddf3a1f61059853c625b7bb03de8433b455f2f79f89548cbcbd5edca3d4a4a SIZE (kcat-openal-soft-1.23.1_GH0.tar.gz) = 840185 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 (Megamouse-VulkanMemoryAllocator-3706484_GH0.tar.gz) = f8e30cd27a21dffd70387eb8058240933c40b6272ea84f89cf61c2f73c5537ec -SIZE (Megamouse-VulkanMemoryAllocator-3706484_GH0.tar.gz) = 1687892 -SHA256 (miniupnp-miniupnp-miniupnpd_2_3_6_GH0.tar.gz) = 6e5ee2239030486675f558cc840d154e5e2db9517efc96c5b0ab2b2c34c1a128 -SIZE (miniupnp-miniupnp-miniupnpd_2_3_6_GH0.tar.gz) = 462607 +SHA256 (Megamouse-VulkanMemoryAllocator-1d8f600_GH0.tar.gz) = 5aef11d98bae2ea911cda9fedcac6935d5bc5d0776cee581fc7b7204bd7b0d47 +SIZE (Megamouse-VulkanMemoryAllocator-1d8f600_GH0.tar.gz) = 962218 +SHA256 (miniupnp-miniupnp-miniupnpd_2_3_9_GH0.tar.gz) = ec7981351ad6a046eee0abf522ed1a45a3b0517e1da64e03826051f5f5354ea5 +SIZE (miniupnp-miniupnp-miniupnpd_2_3_9_GH0.tar.gz) = 540322 SHA256 (nothings-stb-013ac3b_GH0.tar.gz) = f2f5aeaa2504f8dc3ee7412cb480f9be218766c7a652ce3bcebbc25ec72d7e9c SIZE (nothings-stb-013ac3b_GH0.tar.gz) = 1510649 -SHA256 (wolfSSL-wolfssl-v5.7.6-stable_GH0.tar.gz) = 52b1e439e30d1ed8162a16308a8525a862183b67aa30373b11166ecbab000d63 -SIZE (wolfSSL-wolfssl-v5.7.6-stable_GH0.tar.gz) = 24573776 +SHA256 (wolfSSL-wolfssl-v5.8.0-stable_GH0.tar.gz) = f90f18c7f12913a0b351b1f4305e768697ea1380794df1f2984b9452ab0aeeaf +SIZE (wolfSSL-wolfssl-v5.8.0-stable_GH0.tar.gz) = 24936537 SHA256 (xioTechnologies-Fusion-v1.2.8_GH0.tar.gz) = ff9e4b8f09592226e310e8ac55073614743d04ace4e1ab66e96c3b517000600b SIZE (xioTechnologies-Fusion-v1.2.8_GH0.tar.gz) = 447874 SHA256 (thestk-rtmidi-6.0.0_GH0.tar.gz) = ef7bcda27fee6936b651c29ebe9544c74959d0b1583b716ce80a1c6fea7617f0 SIZE (thestk-rtmidi-6.0.0_GH0.tar.gz) = 515502 diff --git a/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_game__list__frame.cpp b/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_game__list__frame.cpp deleted file mode 100644 index af2bc4ddbf9c..000000000000 --- a/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_game__list__frame.cpp +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with Qt >= 6.9.0 - -Backported from: https://github.com/RPCS3/rpcs3/commit/600e4604169464c64cbf548e7629e483ad2aad1e - ---- rpcs3/rpcs3qt/game_list_frame.cpp.orig 2025-03-30 19:45:32 UTC -+++ rpcs3/rpcs3qt/game_list_frame.cpp -@@ -2363,7 +2363,7 @@ void game_list_frame::BatchActionBySerials(progress_di - - connect(future_watcher, &QFutureWatcher::finished, this, [=, this]() - { -- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); -+ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); - pdlg->setCancelButtonText(tr("OK")); - QApplication::beep(); - -@@ -2396,7 +2396,7 @@ void game_list_frame::BatchActionBySerials(progress_di - return; - } - -- pdlg->setLabelText(progressLabel.arg(*index).arg(serials_size)); -+ pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); - pdlg->setCancelButtonText(tr("OK")); - connect(pdlg, &progress_dialog::canceled, this, [pdlg](){ pdlg->deleteLater(); }); - QApplication::beep(); diff --git a/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_ps__move__tracker__dialog.cpp b/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_ps__move__tracker__dialog.cpp deleted file mode 100644 index ce6da7983d15..000000000000 --- a/emulators/rpcs3/files/patch-rpcs3_rpcs3qt_ps__move__tracker__dialog.cpp +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with Qt >= 6.9.0 - -Backported from: https://github.com/RPCS3/rpcs3/commit/600e4604169464c64cbf548e7629e483ad2aad1e - ---- rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp.orig 2025-03-30 19:45:32 UTC -+++ rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp -@@ -362,7 +362,7 @@ void ps_move_tracker_dialog::update_min_radius(bool up - } - void ps_move_tracker_dialog::update_min_radius(bool update_slider) - { -- ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius)); -+ ui->minRadiusGb->setTitle(tr("Min Radius: %0 %").arg(g_cfg_move.min_radius.get())); - - if (update_slider) - { -@@ -372,7 +372,7 @@ void ps_move_tracker_dialog::update_max_radius(bool up - - void ps_move_tracker_dialog::update_max_radius(bool update_slider) - { -- ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius)); -+ ui->maxRadiusGb->setTitle(tr("Max Radius: %0 %").arg(g_cfg_move.max_radius.get())); - - if (update_slider) - { diff --git a/emulators/rpcs3/files/patch-wolfssl b/emulators/rpcs3/files/patch-wolfssl deleted file mode 100644 index c736ccef7dc1..000000000000 --- a/emulators/rpcs3/files/patch-wolfssl +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/wolfSSL/wolfssl/commit/197a7e0ba386 - ---- 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c.orig 2024-12-31 17:58:22 UTC -+++ 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c -@@ -259,8 +259,10 @@ - - if (features & CPUID_AARCH64_FEAT_AES) - cpuid_flags |= CPUID_AES; -- if (features & CPUID_AARCH64_FEAT_PMULL) -+ if (features & CPUID_AARCH64_FEAT_AES_PMULL) { -+ cpuid_flags |= CPUID_AES; - cpuid_flags |= CPUID_PMULL; -+ } - if (features & CPUID_AARCH64_FEAT_SHA256) - cpuid_flags |= CPUID_SHA256; - if (features & CPUID_AARCH64_FEAT_SHA256_512) diff --git a/emulators/rpcs3/pkg-plist b/emulators/rpcs3/pkg-plist index 7013d57775ab..663b6c377e73 100644 --- a/emulators/rpcs3/pkg-plist +++ b/emulators/rpcs3/pkg-plist @@ -1,58 +1,56 @@ bin/rpcs3 share/applications/rpcs3.desktop share/icons/hicolor/48x48/apps/rpcs3.png share/icons/hicolor/scalable/apps/rpcs3.svg share/metainfo/rpcs3.metainfo.xml %%DATADIR%%/GuiConfigs/Classic (Bright).qss %%DATADIR%%/GuiConfigs/Darker Style by TheMitoSan.qss %%DATADIR%%/GuiConfigs/Envy.qss %%DATADIR%%/GuiConfigs/Kuroi (Dark) by Ani.qss %%DATADIR%%/GuiConfigs/ModernBlue Theme by TheMitoSan.qss %%DATADIR%%/GuiConfigs/Nekotekina by GooseWing.qss %%DATADIR%%/GuiConfigs/Skyline (Nightfall).qss %%DATADIR%%/GuiConfigs/Skyline.qss %%DATADIR%%/GuiConfigs/YoRHa by Ani.qss %%DATADIR%%/GuiConfigs/YoRHa-background.jpg %%DATADIR%%/GuiConfigs/check_mark_white.png %%DATADIR%%/GuiConfigs/kot-bg.jpg %%DATADIR%%/GuiConfigs/list_arrow_blue.png %%DATADIR%%/GuiConfigs/list_arrow_down_blue.png %%DATADIR%%/GuiConfigs/list_arrow_down_green.png %%DATADIR%%/GuiConfigs/list_arrow_down_white.png %%DATADIR%%/GuiConfigs/list_arrow_green.png %%DATADIR%%/GuiConfigs/list_arrow_white.png %%DATADIR%%/Icons/ui/L1.png %%DATADIR%%/Icons/ui/L2.png %%DATADIR%%/Icons/ui/R1.png %%DATADIR%%/Icons/ui/R2.png %%DATADIR%%/Icons/ui/circle.png %%DATADIR%%/Icons/ui/cross.png %%DATADIR%%/Icons/ui/dpad.png %%DATADIR%%/Icons/ui/dpad_down.png %%DATADIR%%/Icons/ui/dpad_left.png %%DATADIR%%/Icons/ui/dpad_right.png %%DATADIR%%/Icons/ui/dpad_up.png %%DATADIR%%/Icons/ui/fade_bottom.png %%DATADIR%%/Icons/ui/fade_top.png %%DATADIR%%/Icons/ui/left_stick.png %%DATADIR%%/Icons/ui/new.png %%DATADIR%%/Icons/ui/right_stick.png %%DATADIR%%/Icons/ui/save.png %%DATADIR%%/Icons/ui/select.png %%DATADIR%%/Icons/ui/spinner-24.png %%DATADIR%%/Icons/ui/square.png %%DATADIR%%/Icons/ui/start.png %%DATADIR%%/Icons/ui/triangle.png -%%DATADIR%%/git/README.md -%%DATADIR%%/git/commits.lst %%DATADIR%%/test/dump_stack.elf %%DATADIR%%/test/gs_gcm_basic_triangle.elf %%DATADIR%%/test/gs_gcm_cube.elf %%DATADIR%%/test/gs_gcm_handle_system_cmd.elf %%DATADIR%%/test/gs_gcm_hello_world.elf %%DATADIR%%/test/gs_gcm_tetris.elf %%DATADIR%%/test/pad_test.elf %%DATADIR%%/test/ppu_thread.elf %%DATADIR%%/test/pspgame.elf %%DATADIR%%/test/rpcsp.elf %%DATADIR%%/test/spurs_test.self