diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 85d0823d95dc..0f73a496913d 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,104 +1,104 @@ PORTNAME= yuzu -PORTVERSION= s20210811 +PORTVERSION= s20210814 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 0acf96796cae.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6598 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 \ boost-libs>0:devel/boost-libs \ 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 \ libavcodec.so:multimedia/ffmpeg USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 756d76d97 +GH_TAGNAME= bdd617da0 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.180:Vulkan_Headers/externals/Vulkan-Headers \ MerryMage:dynarmic:r5-88-g7946868a:dynarmic/externals/dynarmic \ ReinUsesLisp:sirit:a395963:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ benhoyt:inih:r52:inih/externals/inih/inih \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ fmtlib:fmt:8.0.0:fmt/externals/fmt \ herumi:xbyak:v5.96:xbyak/externals/xbyak \ kinetiknz:cubeb:cubeb-0.2-1298-g8d53747:cubeb/externals/cubeb \ yhirose:cpp-httplib:v0.9.0-5-g9648f95:cpp_httplib/externals/cpp-httplib 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= Boost_USE_STATIC_LIBS LIBVA_FOUND CMAKE_OFF= YUZU_USE_EXTERNAL_SDL2 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 d3f30b71d60f..2b844718c9e7 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1628718789 -SHA256 (yuzu-emu-yuzu-s20210811-756d76d97_GH0.tar.gz) = 7778f099cdf2de3676480b5570a2814b1f1e1f311ebc7e02ad99be94ae23de10 -SIZE (yuzu-emu-yuzu-s20210811-756d76d97_GH0.tar.gz) = 3963710 +TIMESTAMP = 1628933339 +SHA256 (yuzu-emu-yuzu-s20210814-bdd617da0_GH0.tar.gz) = 2a3c57856ec5705d23551b6aafa573348a44fa68023d9b86ef344373e6427253 +SIZE (yuzu-emu-yuzu-s20210814-bdd617da0_GH0.tar.gz) = 3963648 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-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = 403778 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.180_GH0.tar.gz) = ed4974bd223e3868db3be66c2f1fe0eb85de6ecc897a9a7da2e263a98abdd214 SIZE (KhronosGroup-Vulkan-Headers-v1.2.180_GH0.tar.gz) = 1065448 SHA256 (MerryMage-dynarmic-r5-88-g7946868a_GH0.tar.gz) = 297f0ebc2179028f95e9e5add0cba949d06c07fb3169e4ea5d7bedaf8d87a005 SIZE (MerryMage-dynarmic-r5-88-g7946868a_GH0.tar.gz) = 28297022 SHA256 (ReinUsesLisp-sirit-a395963_GH0.tar.gz) = 2a060a1f8927582b87aad31d2234892d4f67cd6acc5cc9c60023c710c319ada5 SIZE (ReinUsesLisp-sirit-a395963_GH0.tar.gz) = 23399 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (fmtlib-fmt-8.0.0_GH0.tar.gz) = 7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83 SIZE (fmtlib-fmt-8.0.0_GH0.tar.gz) = 804902 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 (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = a37315dd30f20845cb1823ef70b075ee6150c16f2979fb63cb56332ca9d293f4 SIZE (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = 577183 SHA256 (0acf96796cae.patch) = ca713feca740ef8e56fa40de822a83d49cca6d1128eb7945860fb28975bd0c17 SIZE (0acf96796cae.patch) = 4650 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 0a4fdd397c1c..a96aa821af30 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,35 +1,35 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-07-27 01:51:00 UTC +--- CMakeLists.txt.orig 2021-08-14 09:28:59 UTC +++ CMakeLists.txt @@ -395,7 +395,10 @@ if (ENABLE_SDL2) target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") elseif (YUZU_USE_EXTERNAL_SDL2) message(STATUS "Using SDL2 from externals.") - else() + endif() +endif() + +if (NOT YUZU_USE_BUNDLED_SDL2 AND NOT YUZU_USE_EXTERNAL_SDL2) - find_package(SDL2 2.0.15 REQUIRED) + find_package(SDL2 2.0.16 REQUIRED) # Some installations don't set SDL2_LIBRARIES @@ -407,7 +410,6 @@ if (ENABLE_SDL2) include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") - endif() endif() # Install any missing dependencies with conan install --- src/input_common/CMakeLists.txt.orig 2021-04-21 21:36:33 UTC +++ src/input_common/CMakeLists.txt @@ -62,7 +62,7 @@ else() ) endif() -if (ENABLE_SDL2) +if (SDL2_FOUND) target_sources(input_common PRIVATE sdl/sdl_impl.cpp sdl/sdl_impl.h diff --git a/emulators/yuzu/files/patch-sdl2 b/emulators/yuzu/files/patch-sdl2 index 0fb9b30ee992..a96a8f81de69 100644 --- a/emulators/yuzu/files/patch-sdl2 +++ b/emulators/yuzu/files/patch-sdl2 @@ -1,123 +1,128 @@ 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 CMakeLists.txt:397 (find_package): + Could not find a configuration file for package "SDL2" that is compatible + with requested version "2.0.16". -CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): - The source directory + The following configuration files were considered but not accepted: - externals/SDL + /usr/local/lib/cmake/SDL2/sdl2-config.cmake, version: 2.0.12 - does not contain a CMakeLists.txt file. - ---- CMakeLists.txt.orig 2021-07-27 01:51:00 UTC +--- CMakeLists.txt.orig 2021-08-14 09:28:59 UTC +++ CMakeLists.txt @@ -398,7 +398,7 @@ if (ENABLE_SDL2) endif() if (NOT YUZU_USE_BUNDLED_SDL2 AND NOT YUZU_USE_EXTERNAL_SDL2) -- find_package(SDL2 2.0.15 REQUIRED) +- find_package(SDL2 2.0.16 REQUIRED) + find_package(SDL2 2.0.12 REQUIRED) # Some installations don't set SDL2_LIBRARIES if("${SDL2_LIBRARIES}" STREQUAL "") ---- src/input_common/sdl/sdl_impl.cpp.orig 2021-06-02 22:29:09 UTC +--- src/input_common/sdl/sdl_impl.cpp.orig 2021-08-14 09:28:59 UTC +++ src/input_common/sdl/sdl_impl.cpp @@ -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) { @@ -75,6 +76,7 @@ class SDLJoystick { (public) has_gyro = true; } } +#endif } void SetButton(int button, bool value) { -@@ -82,6 +84,7 @@ class SDLJoystick { (public) - state.buttons.insert_or_assign(button, value); +@@ -88,6 +90,7 @@ class SDLJoystick { (public) + } } +#if SDL_VERSION_ATLEAST(2,0,14) void SetMotion(SDL_ControllerSensorEvent event) { constexpr float gravity_constant = 9.80665f; std::lock_guard lock{mutex}; -@@ -109,6 +112,7 @@ class SDLJoystick { (public) +@@ -115,6 +118,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}; -@@ -378,12 +382,14 @@ void SDLState::HandleGameControllerEvent(const SDL_Eve +@@ -429,12 +433,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)); -@@ -823,7 +829,9 @@ SDLState::SDLState() { +@@ -890,11 +896,15 @@ SDLState::SDLState() { + RegisterFactory("sdl", motion_factory); + + // Disable raw input. When enabled this setting causes SDL to die when a web applet opens ++#if SDL_VERSION_ATLEAST(2,0,14) + SDL_SetHint(SDL_HINT_JOYSTICK_RAWINPUT, "0"); ++#endif // 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) ++#if SDL_VERSION_ATLEAST(2,0,16) 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 -@@ -1037,6 +1045,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS +@@ -1108,6 +1118,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; -@@ -1066,6 +1075,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS +@@ -1137,6 +1148,7 @@ Common::ParamPackage SDLEventToMotionParamPackage(SDLS } break; } +#endif } return {}; } -@@ -1169,6 +1179,7 @@ ButtonBindings SDLState::GetNintendoButtonBinding( +@@ -1242,6 +1254,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( +@@ -1250,6 +1263,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 +@@ -1550,7 +1564,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;