diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 656644890705..b94bea27f986 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,128 +1,126 @@ PORTNAME= yuzu -PORTVERSION= s20221203 +PORTVERSION= s20221205 CATEGORIES= emulators .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb .else MASTER_SITES= LOCAL/jbeich:gamedb .endif DISTFILES= ${PORTNAME}-${DISTVERSIONFULL}/compatibility_list.json:gamedb EXTRACT_ONLY= ${DISTFILES:N*\:gamedb:C/\:.*//} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= c17d71240b23.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9042 mainline-merge -PATCHFILES+= 14440b195c66.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9375 MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger WWW= https://yuzu-emu.org/ LICENSE= APACHE20 BSD3CLAUSE GPLv3+ ISCL MIT UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE.txt LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires int128 and dynarmic backend BROKEN_FreeBSD_12= htonl() in fails -Werror=conversion BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ nlohmann-json>0:devel/nlohmann-json \ glslangValidator:graphics/glslang LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libavcodec.so:multimedia/ffmpeg TEST_DEPENDS= catch>0:devel/catch USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= f77cc6c41 +GH_TAGNAME= 3b19f741b GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ yuzu-emu:sirit:d7ad93a:sirit/externals/sirit \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ - KhronosGroup:Vulkan-Headers:v1.3.213:Vulkan_Headers/externals/Vulkan-Headers \ - MerryMage:dynarmic:6.3.1-1-ga5b57bb9:dynarmic/externals/dynarmic \ + KhronosGroup:Vulkan-Headers:v1.3.236:Vulkan_Headers/externals/Vulkan-Headers \ + MerryMage:dynarmic:6.3.1-57-ga76a2fff:dynarmic/externals/dynarmic \ arun11299:cpp-jwt:v1.4-14-ge12ef06:cpp_jwt/externals/cpp-jwt \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ benhoyt:inih:r52:inih/externals/inih/inih \ - fmtlib:fmt:8.1.1:fmt/externals/fmt \ herumi:xbyak:v6.64:xbyak/externals/xbyak \ kinetiknz:cubeb:cubeb-0.2-1350-gf79e0cf:cubeb/externals/cubeb \ lsalzman:enet:v1.3.13-14-g39a72ab:enet/externals/enet \ yhirose:cpp-httplib:v0.10.8-1-g305a7ab:cpp_httplib/externals/cpp-httplib USES= cmake:testing compiler:c++17-lang elfctl localbase:ldflags pkgconfig sdl ssl USE_GCC= yes:build # libc++ lacks std::atomic_ref, std::ranges USE_SDL= sdl2 CMAKE_ON= Boost_USE_STATIC_LIBS CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= YUZU_CHECK_SUBMODULES YUZU_USE_BUNDLED_OPUS YUZU_USE_EXTERNAL_SDL2 CMAKE_OFF+= YUZU_USE_PRECOMPILED_HEADERS DYNARMIC_USE_PRECOMPILED_HEADERS # GCC CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= YUZU_TESTS LDFLAGS+= -static-libstdc++ -static-libgcc # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/} PLIST_FILES= bin/${PORTNAME}-cmd \ bin/${PORTNAME}-room OPTIONS_DEFINE= ALSA PULSEAUDIO JACK NLS QT5 SNDIO VAAPI VULKAN WEBENGINE OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN WEBENGINE 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 NLS_DESC= UI translations (implies QT5) NLS_USE= QT=linguisttools:build NLS_CMAKE_BOOL= ENABLE_QT_TRANSLATION NLS_IMPLIES= QT5 PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=qmake:build,buildtools:build,concurrent:build,core,dbus,gui,multimedia,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES= bin/${PORTNAME} \ share/applications/org.yuzu_emu.yuzu.desktop \ share/icons/hicolor/scalable/apps/org.yuzu_emu.yuzu.svg \ share/metainfo/org.yuzu_emu.yuzu.metainfo.xml \ share/mime/packages/org.yuzu_emu.yuzu.xml SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader WEBENGINE_DESC= Web applet support (implies QT5) WEBENGINE_USE= QT=webengine WEBENGINE_CMAKE_BOOL= YUZU_USE_QT_WEB_ENGINE WEBENGINE_IMPLIES= QT5 post-extract: @${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${_DISTDIR},} \ ${WRKSRC}/dist/compatibility_list/ post-patch: @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in # Temporarily use ConsoleKit2 like sysutils/gnome-settings-daemon @${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \ -e 's,login1,ConsoleKit,' \ ${WRKSRC}/src/${PORTNAME}/main.cpp post-patch-VAAPI-off: @${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \ ${WRKSRC}/CMakeLists.txt .include diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 0111a1be4539..623a246de8a9 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,35 +1,31 @@ -TIMESTAMP = 1670095405 -SHA256 (yuzu-s20221203/compatibility_list.json) = 59f3cefe7c70e0739413262f7b943ec8881001a4282c128ca8d27ebe2eb7d58b -SIZE (yuzu-s20221203/compatibility_list.json) = 1644857 -SHA256 (yuzu-emu-yuzu-s20221203-f77cc6c41_GH0.tar.gz) = cc64784bcd1f1fc6e9d9c3789d5fbe8fa82354811dec33bf2c8ca56dd9fc05c9 -SIZE (yuzu-emu-yuzu-s20221203-f77cc6c41_GH0.tar.gz) = 5275139 +TIMESTAMP = 1670261169 +SHA256 (yuzu-s20221205/compatibility_list.json) = 76d03e453fd8f0c91283be305dcc496f95c1a0d46ebea0d3765d95c557a40f3c +SIZE (yuzu-s20221205/compatibility_list.json) = 1645865 +SHA256 (yuzu-emu-yuzu-s20221205-3b19f741b_GH0.tar.gz) = ee2ff71b5288e202bedb9f75705c773390290a7d9bec0dc2c818a15d5c11bbc1 +SIZE (yuzu-emu-yuzu-s20221205-3b19f741b_GH0.tar.gz) = 5279487 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 (yuzu-emu-sirit-d7ad93a_GH0.tar.gz) = f338a73c12bcc4e6c18a1a8104ca7bf30af40eb37b4054992e3be4c3d3589faa SIZE (yuzu-emu-sirit-d7ad93a_GH0.tar.gz) = 23652 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-201-gc214f6f_GH0.tar.gz) = 5e32aefc599e6d26c2373b7296a37980b9c6c7ff6f636d5eee49f79b437e5a51 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-201-gc214f6f_GH0.tar.gz) = 445472 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 1485380 -SHA256 (MerryMage-dynarmic-6.3.1-1-ga5b57bb9_GH0.tar.gz) = 89aba8404b4624cf506dc0e365fcec3491ab2f74931b2ae522e0cdba0be86367 -SIZE (MerryMage-dynarmic-6.3.1-1-ga5b57bb9_GH0.tar.gz) = 2612971 +SHA256 (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = a86b8c38618b764057b359cf0f18c12a7c81b7760fe6fca1acf9adb471d55d4c +SIZE (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = 1764329 +SHA256 (MerryMage-dynarmic-6.3.1-57-ga76a2fff_GH0.tar.gz) = 8ba40e732a93f29cc535226b74f63adadd816fcb211b70d53f6aa574caa363bd +SIZE (MerryMage-dynarmic-6.3.1-57-ga76a2fff_GH0.tar.gz) = 2621782 SHA256 (arun11299-cpp-jwt-v1.4-14-ge12ef06_GH0.tar.gz) = 0409fa5413800fb291251cf3142e07a43fd4064996fee0e793323d3a74dd33b8 SIZE (arun11299-cpp-jwt-v1.4-14-ge12ef06_GH0.tar.gz) = 1246634 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 (fmtlib-fmt-8.1.1_GH0.tar.gz) = 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346 -SIZE (fmtlib-fmt-8.1.1_GH0.tar.gz) = 826254 SHA256 (herumi-xbyak-v6.64_GH0.tar.gz) = 836b125677e2b0c3d14d624600b8f8bb8342ab5680193559c57835267b709109 SIZE (herumi-xbyak-v6.64_GH0.tar.gz) = 247663 SHA256 (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 8629757290774a34ed3fcd53b6491e9ccc96231018406c58c493f336b3ced908 SIZE (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 220847 SHA256 (lsalzman-enet-v1.3.13-14-g39a72ab_GH0.tar.gz) = bac947ed61414d92ac4689d677f25ab457f29efe4b676547f56b4e913daa6d54 SIZE (lsalzman-enet-v1.3.13-14-g39a72ab_GH0.tar.gz) = 79521 SHA256 (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 2b8ebbe60c5fab1254e454518108cb8da5ee3a07e1cf9f432448d985efe4a003 SIZE (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 620778 SHA256 (c17d71240b23.patch) = 4aaf5522ec3f7d393cec59638220d6142489c4e946060ec94444ca3f47e2b2a7 SIZE (c17d71240b23.patch) = 7562 -SHA256 (14440b195c66.patch) = 277b6655172fb223052061a684298ab4d86c725f1c16704b675f7ba3a33da405 -SIZE (14440b195c66.patch) = 1118 diff --git a/emulators/yuzu/files/patch-dynarmic b/emulators/yuzu/files/patch-dynarmic deleted file mode 100644 index a5429af85e7d..000000000000 --- a/emulators/yuzu/files/patch-dynarmic +++ /dev/null @@ -1,22 +0,0 @@ -Don't install bundled robin-map in dynarmic bundled in yuzu - -===> Checking for items in STAGEDIR missing from pkg-plist -Error: Orphaned: include/tsl/robin_growth_policy.h -Error: Orphaned: include/tsl/robin_hash.h -Error: Orphaned: include/tsl/robin_map.h -Error: Orphaned: include/tsl/robin_set.h -Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapConfig.cmake -Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapConfigVersion.cmake -Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapTargets.cmake - ---- externals/dynarmic/externals/CMakeLists.txt.orig 2021-12-23 11:38:58 UTC -+++ externals/dynarmic/externals/CMakeLists.txt -@@ -24,7 +24,7 @@ target_include_directories(mp INTERFACE $, fmt::v7::format_args)' /usr/local/bin/ld: src/yuzu/CMakeFiles/yuzu.dir/applets/web_browser.cpp.o: in function `QtNXWebEngineView::LoadExtractedFonts()': web_browser.cpp:(.text+0x14e7): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/yuzu/CMakeFiles/yuzu.dir/configuration/config.cpp.o: in function `Config::Initialize(std::__cxx11::basic_string, std::allocator > const&)': config.cpp:(.text+0x11064): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: config.cpp:(.text+0x111cc): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: config.cpp:(.text+0x1136c): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/yuzu/CMakeFiles/yuzu.dir/configuration/configure_per_game.cpp.o:configure_per_game.cpp:(.text+0x1348): more undefined references to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' follow /usr/local/bin/ld: src/core/libcore.a(core.cpp.o): in function `void fmt::v7::detail::format_value(fmt::v7::detail::buffer&, Loader::ResultStatus const&, fmt::v7::detail::locale_ref)': core.cpp:(.text._ZN3fmt2v76detail12format_valueIcN6Loader12ResultStatusEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN6Loader12ResultStatusEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' /usr/local/bin/ld: src/core/libcore.a(key_manager.cpp.o): in function `Core::Crypto::KeyManager::SetKey(Core::Crypto::S128KeyType, std::array, unsigned long, unsigned long)': key_manager.cpp:(.text+0x6d22): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: key_manager.cpp:(.text+0x6e8f): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: key_manager.cpp:(.text+0x6fc1): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: key_manager.cpp:(.text+0x7057): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: key_manager.cpp:(.text+0x709d): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/core/libcore.a(key_manager.cpp.o):key_manager.cpp:(.text+0x70e3): more undefined references to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' follow /usr/local/bin/ld: src/core/libcore.a(boxcat.cpp.o): in function `void fmt::v7::detail::value, char> >::format_custom_arg >(void const*, fmt::v7::basic_format_parse_context&, fmt::v7::basic_format_context, char>&)': boxcat.cpp:(.text+0x4492): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' /usr/local/bin/ld: src/core/libcore.a(boxcat.cpp.o): in function `Service::BCAT::Boxcat::Client::DownloadInternal(std::__cxx11::basic_string, std::allocator > const&, unsigned int, std::__cxx11::basic_string, std::allocator > const&)': boxcat.cpp:(.text+0x4fc4): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/core/libcore.a(boxcat.cpp.o): in function `Service::BCAT::SynchronizeInternal(Service::AM::Applets::AppletManager&, std::function (unsigned long)>, Service::BCAT::TitleIDVersion, Service::BCAT::ProgressServiceBackend&, std::optional, std::allocator > >)': boxcat.cpp:(.text+0x5c80): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: boxcat.cpp:(.text+0x5d4b): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/core/libcore.a(boxcat.cpp.o): in function `Service::BCAT::Boxcat::GetLaunchParameter(Service::BCAT::TitleIDVersion)': boxcat.cpp:(.text+0x6e98): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: boxcat.cpp:(.text+0x70ac): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: src/core/libcore.a(bis_factory.cpp.o):bis_factory.cpp:(.text+0xacf): more undefined references to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' follow /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(basic_block.cpp.o): in function `void fmt::v7::detail::format_value(fmt::v7::detail::buffer&, Dynarmic::IR::LocationDescriptor const&, fmt::v7::detail::locale_ref)': basic_block.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR18LocationDescriptorEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR18LocationDescriptorEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(location_descriptor.cpp.o): in function `Dynarmic::IR::operator<<(std::ostream&, Dynarmic::IR::LocationDescriptor const&)': location_descriptor.cpp:(.text+0x37): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(a32_emit_x64.cpp.o): in function `Dynarmic::Backend::X64::A32EmitX64::LocationDescriptorToFriendlyName[abi:cxx11](Dynarmic::IR::LocationDescriptor const&) const': a32_emit_x64.cpp:(.text+0x69c): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(a32_emit_x64.cpp.o): in function `Dynarmic::Backend::X64::A32EmitX64::GenFastmemFallbacks()': a32_emit_x64.cpp:(.text+0x4f76): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: a32_emit_x64.cpp:(.text+0x5366): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(a64_emit_x64.cpp.o): in function `Dynarmic::Backend::X64::A64EmitX64::LocationDescriptorToFriendlyName[abi:cxx11](Dynarmic::IR::LocationDescriptor const&) const': a64_emit_x64.cpp:(.text+0x65): undefined reference to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(a64_emit_x64.cpp.o):a64_emit_x64.cpp:(.text+0x533d): more undefined references to `fmt::v7::detail::vformat[abi:cxx11](fmt::v7::basic_string_view, fmt::v7::format_args)' follow /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(microinstruction.cpp.o): in function `void fmt::v7::detail::format_value(fmt::v7::detail::buffer&, Dynarmic::IR::Opcode const&, fmt::v7::detail::locale_ref)': microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR6OpcodeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR6OpcodeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' /usr/local/bin/ld: externals/dynarmic/src/libdynarmic.a(microinstruction.cpp.o): in function `void fmt::v7::detail::format_value(fmt::v7::detail::buffer&, Dynarmic::IR::Type const&, fmt::v7::detail::locale_ref)': microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' collect2: error: ld returned 1 exit status ---- CMakeLists.txt.orig 2022-11-30 15:41:32 UTC +--- CMakeLists.txt.orig 2022-12-05 17:26:09 UTC +++ CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-FileCopyrightText: 2018 yuzu Emulator Project - # SPDX-License-Identifier: GPL-2.0-or-later - --cmake_minimum_required(VERSION 3.22) -+cmake_minimum_required(VERSION 3.15) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") -@@ -180,7 +179,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DI - # System imported libraries +@@ -200,7 +200,6 @@ find_package(enet 1.3) # ======================================================================= --find_package(fmt 8.0.1 REQUIRED CONFIG) - find_package(nlohmann_json 3.8 REQUIRED CONFIG) - find_package(ZLIB 1.2 REQUIRED) - ---- externals/CMakeLists.txt.orig 2021-02-22 04:23:45 UTC -+++ externals/CMakeLists.txt -@@ -15,6 +15,10 @@ endif() - add_library(catch-single-include INTERFACE) - target_include_directories(catch-single-include INTERFACE catch/single_include) - -+# libfmt -+add_subdirectory(fmt) -+add_library(fmt::fmt ALIAS fmt) -+ - # Dynarmic - if (ARCHITECTURE_x86_64) - set(DYNARMIC_TESTS OFF) + find_package(enet 1.3) +-find_package(fmt 9 REQUIRED) + find_package(inih) + find_package(lz4 1.8 REQUIRED) + find_package(nlohmann_json 3.8 REQUIRED)