Date: Sat, 5 Jun 2021 22:59:25 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: be6ef66c1788 - 2021Q2 - emulators/yuzu: update to s20210602 Message-ID: <202106052259.155MxPDP013691@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=be6ef66c1788344be9f94a122cc9abc70bd41d32 commit be6ef66c1788344be9f94a122cc9abc70bd41d32 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-06-02 04:34:48 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-06-05 22:55:35 +0000 emulators/yuzu: update to s20210602 Changes: https://github.com/yuzu-emu/yuzu/compare/519ddfae0...4ea171fa5 (cherry picked from commit a500d6f8fb2d1f5123606eaf16642310f42e4971) --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- emulators/yuzu/files/patch-sdl2 | 36 ++++++++++++++++++++++++++---------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index a61dd65b17f1..e3387f251f0b 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,6 +1,6 @@ PORTNAME= yuzu -PORTVERSION= s20210531 +PORTVERSION= s20210602 PORTREVISION?= 0 CATEGORIES= emulators @@ -43,7 +43,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ 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 \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index d5cb2d5d372f..0b507194e49a 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -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 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 @@ -20,9 +20,9 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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() { @@ -30,7 +30,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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; } } @@ -38,7 +38,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): } 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); } @@ -46,7 +46,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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); } @@ -54,7 +54,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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; } @@ -69,7 +69,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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"); @@ -79,7 +79,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): // 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; } @@ -87,7 +87,7 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): 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; } @@ -95,7 +95,23 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): } 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106052259.155MxPDP013691>