diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 2c7e6b4cc652..8db6a69262d6 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,113 +1,113 @@ PORTNAME= yuzu -PORTVERSION= s20210531 +PORTVERSION= s20210602 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a2686843592e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836 mainline-merge PATCHFILES+= e2d5cff34554.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 5e559324a080.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 3bfdd34ce241.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 234d7ded1c52.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 2caf2f0fe288.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= b9ff77485840.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 26907dfe941c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 043027f85b64.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 169384b954b9.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge PATCHFILES+= 16a67d43d9a4.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger LICENSE= APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_FILE_LGPL3+ = ${_LICENSE_STORE}/LGPL3 # sirit LICENSE_FILE_MIT= ${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 ONLY_FOR_ARCHS_REASON= requires int128 BUILD_DEPENDS= catch>0:devel/catch \ nlohmann-json>0:devel/nlohmann-json \ glslangValidator:graphics/glslang LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzip.so:archivers/libzip \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libboost_context.so:devel/boost-libs \ libavcodec.so:multimedia/ffmpeg USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 519ddfae0 +GH_TAGNAME= 4ea171fa5 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \ MerryMage:dynarmic:r5-67-g9a23c09c:dynarmic/externals/dynarmic \ ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ fmtlib:fmt:7.1.2:fmt/externals/fmt \ herumi:xbyak:v5.96:xbyak/externals/xbyak \ kinetiknz:cubeb:cubeb-0.2-1298-g8d53747:cubeb/externals/cubeb \ benhoyt:inih:r52:inih/externals/inih/inih USES= cmake:testing compiler:c++17-lang localbase:ldflags sdl ssl USE_GCC= yes:build # libc++ lacks std::atomic_ref, std::ranges USE_SDL= sdl2 CMAKE_ON= YUZU_ALLOW_SYSTEM_SDL2 CMAKE_OFF= ENABLE_GNUTLS ENABLE_MBEDTLS LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO VULKAN OPTIONS_DEFAULT=PULSEAUDIO JACK SNDIO VULKAN OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_CMAKE_BOOL= USE_ALSA JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME}-cmd QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,webengine,widgets QT5_CMAKE_BOOL= ENABLE_QT ENABLE_QT_TRANSLATION YUZU_USE_QT_WEB_ENGINE QT5_PLIST_FILES=bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/mime/packages/${PORTNAME}.xml VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader .if !exists(${.CURDIR:H:H}/www/qt5-webengine) # Temporarily disable web applet if qt5-webengine is missing QT5_USE:= ${QT5_USE:S/,webengine//} QT5_CMAKE_BOOL:= ${QT5_CMAKE_BOOL:N*WEB_ENGINE} .endif post-patch: @${REINPLACE_CMD} -e '/check_submodules_present()/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in .include diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index cfea9b271d80..49359f72ee88 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,47 +1,47 @@ -TIMESTAMP = 1622485736 -SHA256 (yuzu-emu-yuzu-s20210531-519ddfae0_GH0.tar.gz) = f1a6373cba4de696d315c52e4f096468df64d9d723d0a74128915167c49ad609 -SIZE (yuzu-emu-yuzu-s20210531-519ddfae0_GH0.tar.gz) = 3845550 +TIMESTAMP = 1622672949 +SHA256 (yuzu-emu-yuzu-s20210602-4ea171fa5_GH0.tar.gz) = 8f892dfa6d7c2a440ab1cfcc2fb125cab9dad98b8e53333447deddb71bbcc629 +SIZE (yuzu-emu-yuzu-s20210602-4ea171fa5_GH0.tar.gz) = 3846587 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = c8656969f0dc33f5f544b9449f02d66b7c9de67e6e58376c1cd4999694ab8517 SIZE (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = 766896 SHA256 (MerryMage-dynarmic-r5-67-g9a23c09c_GH0.tar.gz) = d57af163efa4af13f7f913555cbdc9f430dfa1594e45f80b9c43a72451404c5b SIZE (MerryMage-dynarmic-r5-67-g9a23c09c_GH0.tar.gz) = 28231126 SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (fmtlib-fmt-7.1.2_GH0.tar.gz) = 4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c SIZE (fmtlib-fmt-7.1.2_GH0.tar.gz) = 769401 SHA256 (herumi-xbyak-v5.96_GH0.tar.gz) = 727f15d3ed786cae255ebfed1829a84a357c0e4856c6304456d77f1b56c3d2c6 SIZE (herumi-xbyak-v5.96_GH0.tar.gz) = 226999 SHA256 (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = b5cd93de1ca5c9810594a8ec9ac4a3f7c0014cb5d90827034839405a82553fba SIZE (kinetiknz-cubeb-cubeb-0.2-1298-g8d53747_GH0.tar.gz) = 218055 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808 SHA256 (a2686843592e.patch) = 78ce14d6aa5f808ed6d7eb581e28b7b6af8c0c62161bf4f8d791c2bdc113e911 SIZE (a2686843592e.patch) = 10853 SHA256 (e2d5cff34554.patch) = a653e1593d13e558373bfe630a65022cb56d6cc623b382e7b8374142877a6386 SIZE (e2d5cff34554.patch) = 5944 SHA256 (5e559324a080.patch) = d2750ff351bad8d8e5f10a26b27194a54a0d929cda4b51cfff821ff73b3ca684 SIZE (5e559324a080.patch) = 11749 SHA256 (3bfdd34ce241.patch) = 872af12ed04c2cebeb31088af0f483cbea02457623f629c091200a9d2f47d55d SIZE (3bfdd34ce241.patch) = 6472 SHA256 (234d7ded1c52.patch) = 7c53dac00ef7d602ad74af30d4ac4e469f3d46fffe05d528a492e318eebce891 SIZE (234d7ded1c52.patch) = 21968 SHA256 (2caf2f0fe288.patch) = 8d69edd9890554082e6e41011f0bb6128850c9b0aba00a9800584cf02b16e090 SIZE (2caf2f0fe288.patch) = 11925 SHA256 (b9ff77485840.patch) = 118643e60cc17c1e0691ad5e98d84c1824c64dda7e256cc05ffd7cf87c17a2de SIZE (b9ff77485840.patch) = 6679 SHA256 (26907dfe941c.patch) = e255c4cfd710f1940e198047142eb95fcfddf916bbeac4c4741ba54a1a039627 SIZE (26907dfe941c.patch) = 3670 SHA256 (043027f85b64.patch) = caf4ba797d51e15cb9a1006cd10d1f918c6d3f85164164ac8495495349a70ee5 SIZE (043027f85b64.patch) = 4700 SHA256 (169384b954b9.patch) = 1f4240c6aa6d20054eef8087304f513468bfc4cbaca457874fe99cc1f1828bb4 SIZE (169384b954b9.patch) = 6093 SHA256 (16a67d43d9a4.patch) = f14f33fbdd2a318556239e2a97e71a949d923d69a3c0935d9e159a5c67f6e73c SIZE (16a67d43d9a4.patch) = 4616 diff --git a/emulators/yuzu/files/patch-sdl2 b/emulators/yuzu/files/patch-sdl2 index 6eda6f9d8d2e..e10b98a630f8 100644 --- a/emulators/yuzu/files/patch-sdl2 +++ b/emulators/yuzu/files/patch-sdl2 @@ -1,107 +1,123 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252371 -- SDL2 2.0.15 or newer not found, falling back to externals. CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): The source directory externals/SDL does not contain a CMakeLists.txt file. --- CMakeLists.txt.orig 2021-05-19 22:47:48 UTC +++ CMakeLists.txt @@ -297,7 +297,7 @@ endif() if (NOT YUZU_USE_BUNDLED_SDL2) if (YUZU_ALLOW_SYSTEM_SDL2) - find_package(SDL2 2.0.15 QUIET) + find_package(SDL2 2.0.12 QUIET) if (TRUE) if (SDL2_FOUND) ---- src/input_common/sdl/sdl_impl.cpp.orig 2021-05-19 22:47:48 UTC +--- src/input_common/sdl/sdl_impl.cpp.orig 2021-06-02 22:29:09 UTC +++ src/input_common/sdl/sdl_impl.cpp -@@ -74,6 +74,7 @@ class SDLJoystick { (public) +@@ -64,6 +64,7 @@ class SDLJoystick { (public) } void EnableMotion() { +#if SDL_VERSION_ATLEAST(2,0,14) if (sdl_controller) { SDL_GameController* controller = sdl_controller.get(); if (SDL_GameControllerHasSensor(controller, SDL_SENSOR_ACCEL) && !has_accel) { -@@ -85,6 +86,7 @@ class SDLJoystick { (public) +@@ -75,6 +76,7 @@ class SDLJoystick { (public) has_gyro = true; } } +#endif } void SetButton(int button, bool value) { -@@ -92,6 +94,7 @@ class SDLJoystick { (public) +@@ -82,6 +84,7 @@ class SDLJoystick { (public) state.buttons.insert_or_assign(button, value); } +#if SDL_VERSION_ATLEAST(2,0,14) void SetMotion(SDL_ControllerSensorEvent event) { constexpr float gravity_constant = 9.80665f; std::lock_guard lock{mutex}; -@@ -119,6 +122,7 @@ class SDLJoystick { (public) +@@ -109,6 +112,7 @@ class SDLJoystick { (public) motion.UpdateRotation(time_difference * 1000); motion.UpdateOrientation(time_difference * 1000); } +#endif bool GetButton(int button) const { std::lock_guard lock{mutex}; -@@ -352,12 +356,14 @@ void SDLState::HandleGameControllerEvent(const SDL_Eve +@@ -378,12 +382,14 @@ void SDLState::HandleGameControllerEvent(const SDL_Eve } break; } +#if SDL_VERSION_ATLEAST(2,0,14) case SDL_CONTROLLERSENSORUPDATE: { if (auto joystick = GetSDLJoystickBySDLID(event.csensor.which)) { joystick->SetMotion(event.csensor); } break; } +#endif case SDL_JOYDEVICEREMOVED: LOG_DEBUG(Input, "Controller removed with Instance_ID {}", event.jdevice.which); CloseJoystick(SDL_JoystickFromInstanceID(event.jdevice.which)); -@@ -797,7 +803,9 @@ SDLState::SDLState() { +@@ -823,7 +829,9 @@ SDLState::SDLState() { // Enable HIDAPI rumble. This prevents SDL from disabling motion on PS4 and PS5 controllers SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); +#if SDL_VERSION_ATLEAST(2,0,15) SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); +#endif // Tell SDL2 to use the hidapi driver. This will allow joycons to be detected as a // GameController and not a generic one -@@ -1003,6 +1011,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS +@@ -1037,6 +1045,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS } break; } +#if SDL_VERSION_ATLEAST(2,0,14) case SDL_CONTROLLERSENSORUPDATE: { bool is_motion_shaking = false; constexpr float gyro_threshold = 5.0f; -@@ -1032,6 +1041,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS +@@ -1066,6 +1075,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS } break; } +#endif } return {}; } -@@ -1295,7 +1305,9 @@ class SDLMotionPoller final : public SDLPoller { (publ +@@ -1169,6 +1179,7 @@ ButtonBindings SDLState::GetNintendoButtonBinding( + auto sl_button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER; + auto sr_button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER; + ++#if SDL_VERSION_ATLEAST(2,0,14) + if (joystick->IsJoyconLeft()) { + sl_button = SDL_CONTROLLER_BUTTON_PADDLE2; + sr_button = SDL_CONTROLLER_BUTTON_PADDLE4; +@@ -1177,6 +1188,7 @@ ButtonBindings SDLState::GetNintendoButtonBinding( + sl_button = SDL_CONTROLLER_BUTTON_PADDLE3; + sr_button = SDL_CONTROLLER_BUTTON_PADDLE1; + } ++#endif + + return { + std::pair{Settings::NativeButton::A, SDL_CONTROLLER_BUTTON_A}, +@@ -1462,7 +1474,9 @@ class SDLMotionPoller final : public SDLPoller { (publ [[fallthrough]]; case SDL_JOYBUTTONUP: case SDL_JOYHATMOTION: +#if SDL_VERSION_ATLEAST(2,0,14) case SDL_CONTROLLERSENSORUPDATE: +#endif return {SDLEventToMotionParamPackage(state, event)}; } return std::nullopt;