diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 7425ab129bd8..6143240ead68 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,114 +1,114 @@ PORTNAME= yuzu -PORTVERSION= s20210508 +PORTVERSION= s20210509 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 419fb3c8f97a.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836 PATCHFILES+= abdf90282438.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= acf3dae05eae.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 0b3842759127.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 964339d0ac20.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 1602b9e80410.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= e32b8885b4a3.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 225202534545.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 9d1a5e53149b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= 2f5a562b8c58.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 PATCHFILES+= aa6638d8c01b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 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 \ 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= 72a49c2bb +GH_TAGNAME= ec50a9b5b GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-52-geac2416b8: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:r4-219-gb2a4da5e: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 \ nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \ kinetiknz:cubeb:cubeb-0.2-1298-g8d53747:cubeb/externals/cubeb \ benhoyt:inih:r52:inih/externals/inih/inih USES= cmake compiler:c++17-lang localbase:ldflags sdl ssl USE_GCC= yes:build # libc++ lacks std::atomic_ref, std::ranges USE_SDL= sdl2 CMAKE_OFF= ENABLE_GNUTLS ENABLE_MBEDTLS LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test 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 78cab585b229..2390f82b14f1 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,49 +1,49 @@ -TIMESTAMP = 1620463884 -SHA256 (yuzu-emu-yuzu-s20210508-72a49c2bb_GH0.tar.gz) = 40bc62dd57f57a5420691c9d8563270e7bb98d167296459fb8632f9d6677792e -SIZE (yuzu-emu-yuzu-s20210508-72a49c2bb_GH0.tar.gz) = 3833374 +TIMESTAMP = 1620616500 +SHA256 (yuzu-emu-yuzu-s20210509-ec50a9b5b_GH0.tar.gz) = 9bf8194b1bc6b891330d412803c76f70f403d906a4c285e01191fb2c20b175aa +SIZE (yuzu-emu-yuzu-s20210509-ec50a9b5b_GH0.tar.gz) = 3832374 SHA256 (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 8d3b480b4121feaa30f12fdec06de741775465454610202363edaf7564d4f3bb SIZE (yuzu-emu-mbedtls-v2.16.9-52-geac2416b8_GH0.tar.gz) = 2676404 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-r4-219-gb2a4da5e_GH0.tar.gz) = 696ae92c3d515faef17b91d2dd0c306e62d89e959a6c802df8955ad5a8a88ffa SIZE (MerryMage-dynarmic-r4-219-gb2a4da5e_GH0.tar.gz) = 27446619 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 (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 63050daee06c5bcf0f8fd82103e3e84e83772f3a646f42bfa3851afc7aca4ce1 SIZE (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 1211650 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 (419fb3c8f97a.patch) = 329f1f7374bb39070c40158aa0e09013a883d010b06d6300e8b7d3478a23bb41 SIZE (419fb3c8f97a.patch) = 10853 SHA256 (abdf90282438.patch) = befe1f9093b214d0f5031f0f43f5ee5fd4b0c35216d9ea3e226ac2c62f45df1d SIZE (abdf90282438.patch) = 5944 SHA256 (acf3dae05eae.patch) = 8c4a3f9606b3e655c17c0f78fd70191dd2863aca6af9403276c7368428e49d73 SIZE (acf3dae05eae.patch) = 11749 SHA256 (0b3842759127.patch) = 282d63fa72cbc671bdcf511f4a5ccac29aedbe98a3e86f86fd377f2037e831d9 SIZE (0b3842759127.patch) = 6472 SHA256 (964339d0ac20.patch) = ed048d21500f3ea4275a77fe4f793f995bf431d82e148c37590906fa4b034622 SIZE (964339d0ac20.patch) = 21968 SHA256 (1602b9e80410.patch) = 4633e774d22a5e5fe7d6185872c96dd73e3130242c85547b44b97daa0ebe13bf SIZE (1602b9e80410.patch) = 11925 SHA256 (e32b8885b4a3.patch) = ad8511593013e87280ebc6f7d7889873bcb61fe3da4e4d6104c4c2d3faeffc92 SIZE (e32b8885b4a3.patch) = 6679 SHA256 (225202534545.patch) = f99e8aa4db6660dee0162cb69521a93e707ebd7bb1c665fe36cc1d44f572ce9c SIZE (225202534545.patch) = 3670 SHA256 (9d1a5e53149b.patch) = 0a59dd04bf6a06eced1ef2fbea360214accf717a65d75613a442eed5e8c5a9f8 SIZE (9d1a5e53149b.patch) = 4700 SHA256 (2f5a562b8c58.patch) = 0216a4136ff1b62fb1a815974dd050fd193f3812e9a652e53955837a5a0f6dc9 SIZE (2f5a562b8c58.patch) = 6093 SHA256 (aa6638d8c01b.patch) = 066225b6af5143bfa21094004ee0824681135bd82a7004760dffc2e8268f45d5 SIZE (aa6638d8c01b.patch) = 4616 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 6b7b96fe03ef..a113b73cafff 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,30 +1,30 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-04-21 21:36:33 UTC +--- CMakeLists.txt.orig 2021-05-10 03:15:00 UTC +++ CMakeLists.txt -@@ -273,9 +273,13 @@ if (ENABLE_SDL2) +@@ -291,9 +291,13 @@ if (ENABLE_SDL2) add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") - else() + endif() +endif() + +if (NOT YUZU_USE_BUNDLED_SDL2) - find_package(SDL2 2.0.14 QUIET) + find_package(SDL2 2.0.15 QUIET) + if (TRUE) if (SDL2_FOUND) # Some installations don't set SDL2_LIBRARIES if("${SDL2_LIBRARIES}" STREQUAL "") --- 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 2ece8df5c8d4..9a0ca406d41e 100644 --- a/emulators/yuzu/files/patch-sdl2 +++ b/emulators/yuzu/files/patch-sdl2 @@ -1,22 +1,22 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252371 --- SDL2 2.0.14 or newer not found, falling back to externals. +-- 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-04-23 22:48:47.000000000 +0000 +--- CMakeLists.txt.orig 2021-05-10 03:15:00 UTC +++ CMakeLists.txt @@ -293,7 +293,7 @@ if (ENABLE_SDL2) endif() if (NOT YUZU_USE_BUNDLED_SDL2) -- find_package(SDL2 2.0.14 QUIET) +- find_package(SDL2 2.0.15 QUIET) + find_package(SDL2 2.0.12 QUIET) if (TRUE) if (SDL2_FOUND)