diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 48411b769cf8..8e50af1de3d0 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,115 +1,114 @@ PORTNAME= yuzu -PORTVERSION= s20210414 +PORTVERSION= s20210417 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 09efade03619.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/1340 -PATCHFILES+= 91076a814ff2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836 -PATCHFILES+= ec7337d1da05.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 4c1e00b7780f.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 1d703019d37a.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 96dc85f79b0b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 8ab3e2366b32.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= c279e3ad6104.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 9b429b84617c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= cc4650cc8a84.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= 4233c859a602.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 -PATCHFILES+= c8880a62d365.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= abf034785ed2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836 +PATCHFILES+= d37bd764e826.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= d04bf0f3726d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= 098eed11d05e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= 931b5dfb8af9.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= b2330ec6a431.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= 21e69958e168.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= ffc1b3a3dd67.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= f736f4a65bc0.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= 09b61318aa4f.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 +PATCHFILES+= 4c3d3bbd2ad4.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= eedbe8351 +GH_TAGNAME= ce921e0f2 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 8652e31eeb03..972a48ce0b2a 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,51 +1,49 @@ -TIMESTAMP = 1618435551 -SHA256 (yuzu-emu-yuzu-s20210414-eedbe8351_GH0.tar.gz) = be0be285aaaf151ccdc0dc4146fb349ae36a52df486675a94a6723f5f7531ea9 -SIZE (yuzu-emu-yuzu-s20210414-eedbe8351_GH0.tar.gz) = 3606638 +TIMESTAMP = 1618684637 +SHA256 (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 19c957c8299a005ef6e72a2b17572d43aff4fba418809776d4927632e5cb5eb2 +SIZE (yuzu-emu-yuzu-s20210417-ce921e0f2_GH0.tar.gz) = 3795308 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 (09efade03619.patch) = 096e4ed92b58e788be04766774b8eedc958d490fd5df35e51a239253ca1f8180 -SIZE (09efade03619.patch) = 2551 -SHA256 (91076a814ff2.patch) = 6060de2a8ae4fb5f3f244daccc42d3bce7d6ee42918234f1f2720ac36f12cb6b -SIZE (91076a814ff2.patch) = 10992 -SHA256 (ec7337d1da05.patch) = fc6f8cc5fe86ed588d9d4115da88cc16c04a2a7fbcea851486f33c334cae3a24 -SIZE (ec7337d1da05.patch) = 5944 -SHA256 (4c1e00b7780f.patch) = 5520cdfc27951b72661ab7777e9cc6b551d8f30e6f9ec22e4544b25eab367c83 -SIZE (4c1e00b7780f.patch) = 11749 -SHA256 (1d703019d37a.patch) = 2b578d68cd96416c13f073238628691f63abecf6d2e6ab906d293062799075ca -SIZE (1d703019d37a.patch) = 6472 -SHA256 (96dc85f79b0b.patch) = bdd39790b87ae771d94e03be730ac17db69427fa538d84724e555f4149b77e29 -SIZE (96dc85f79b0b.patch) = 21980 -SHA256 (8ab3e2366b32.patch) = d4cb57b295840b0a6553dec300acbaa40c212bd235481bfefac78e5ca855645a -SIZE (8ab3e2366b32.patch) = 11925 -SHA256 (c279e3ad6104.patch) = 528ae5a9f06f06116863dae30918ea471a98522515ba43248ff53cbbf33d766e -SIZE (c279e3ad6104.patch) = 6679 -SHA256 (9b429b84617c.patch) = 69b45a549a7b584276a6592c19f8434bde8b06173d93435c5c467995141678d4 -SIZE (9b429b84617c.patch) = 3670 -SHA256 (cc4650cc8a84.patch) = 48b09c977205f7107c4f26aae0a76797dc4702ab4a6af7db961d7cbad025d81f -SIZE (cc4650cc8a84.patch) = 4700 -SHA256 (4233c859a602.patch) = 1ceafe906bc4a70f54450c3c80eafb0f443fe3165a232770c94a0a0f961352ac -SIZE (4233c859a602.patch) = 6093 -SHA256 (c8880a62d365.patch) = f0873e838ac50206850d3673712a7d25d187003ff280f02379d5e23ead90221c -SIZE (c8880a62d365.patch) = 4616 +SHA256 (abf034785ed2.patch) = 14704f7a15146ca03f958d119fa485d8265ea8201f06369bfe9453f49d9775f9 +SIZE (abf034785ed2.patch) = 11178 +SHA256 (d37bd764e826.patch) = 20e4cd888744e98f4cf84d9eef7649be0d2ad123673bd331f9004a9bf0a9add0 +SIZE (d37bd764e826.patch) = 5944 +SHA256 (d04bf0f3726d.patch) = f37978b6b8dc0db3c2122368e72fc0a9bda8b1fc74025ec01c9e12f72af15aa4 +SIZE (d04bf0f3726d.patch) = 11749 +SHA256 (098eed11d05e.patch) = 99a52b14914ee3178e5b555cbbe78db9b51cc9b51109cf6489867dcbee49e519 +SIZE (098eed11d05e.patch) = 6472 +SHA256 (931b5dfb8af9.patch) = 95e305c337d440e8f87abd67eff63fd03256f76a241757e9853fb5c74f98b8ad +SIZE (931b5dfb8af9.patch) = 21968 +SHA256 (b2330ec6a431.patch) = 48016002a219483dacaafd5d0ecfa2e20abdbfdd03db2747be4d096efd1867cc +SIZE (b2330ec6a431.patch) = 11925 +SHA256 (21e69958e168.patch) = af335daf474e5645bda2ba8a7a7febe112b13a60e9105581d4fb5b9d98d102ef +SIZE (21e69958e168.patch) = 6679 +SHA256 (ffc1b3a3dd67.patch) = 9f6c8a107d1ab4c5811c10ea20b771f1f31dd5141086c23c5e537a6e664d31f0 +SIZE (ffc1b3a3dd67.patch) = 3670 +SHA256 (f736f4a65bc0.patch) = c4aac19b310cc7afe05450ec2aade85c7fac83774731d2885d19250b4645d1b9 +SIZE (f736f4a65bc0.patch) = 4700 +SHA256 (09b61318aa4f.patch) = b0b0b734581d9d0f2b28c71de67ee83ef113b2b052049a95fe1830b40ffa4d13 +SIZE (09b61318aa4f.patch) = 6093 +SHA256 (4c3d3bbd2ad4.patch) = 25877444f0908f1980b45cfe410471045a8f8778728fe54a481212699d8d240a +SIZE (4c3d3bbd2ad4.patch) = 4616 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 048760fdda36..02af027bd196 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,15 +1,27 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2020-06-29 05:12:38 UTC +--- CMakeLists.txt.orig 2021-04-16 17:36:48 UTC +++ CMakeLists.txt -@@ -225,7 +225,9 @@ if(ENABLE_SDL2) - list(APPEND CMAKE_MODULE_PATH "${CONAN_SDL2_ROOT_RELEASE}") - list(APPEND CMAKE_PREFIX_PATH "${CONAN_SDL2_ROOT_RELEASE}") - endif() -- find_package(SDL2) +@@ -274,8 +274,12 @@ if (ENABLE_SDL2) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") + target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") + else() +- find_package(SDL2 REQUIRED) ++ find_package(SDL2) ++ endif() +endif() -+find_package(SDL2) -+if(ENABLE_SDL2) - if (NOT SDL2_FOUND) - # otherwise add this to the list of libraries to install - list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.12@bincrafters/stable") + ++if(SDL2_FOUND) ++ if(NOT YUZU_USE_BUNDLED_SDL2) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") + message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") +@@ -286,8 +290,6 @@ if (ENABLE_SDL2) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") + endif() +-else() +- set(SDL2_FOUND NO) + endif() + + # Install any missing dependencies with conan install diff --git a/emulators/yuzu/files/patch-fmt b/emulators/yuzu/files/patch-fmt index d57b3cdc7856..4bbfe5b13d67 100644 --- a/emulators/yuzu/files/patch-fmt +++ b/emulators/yuzu/files/patch-fmt @@ -1,72 +1,72 @@ Partially revert https://github.com/yuzu-emu/yuzu/commit/bc30a591ba72 /usr/local/bin/ld: src/yuzu/CMakeFiles/yuzu.dir/about_dialog.cpp.o: in function `AboutDialog::AboutDialog(QWidget*)': about_dialog.cpp:(.text+0x3d3): 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/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 2021-02-22 04:23:45 UTC +--- CMakeLists.txt.orig 2021-04-17 06:14:44 UTC +++ CMakeLists.txt -@@ -165,7 +165,6 @@ macro(yuzu_find_packages) +@@ -166,7 +166,6 @@ macro(yuzu_find_packages) set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg "Catch2 2.13 catch2/2.13.0" - "fmt 7.1 fmt/7.1.2" - # can't use until https://github.com/bincrafters/community/issues/1173 - #"libzip 1.5 libzip/1.5.2@bincrafters/stable" "lz4 1.8 lz4/1.9.2" + "nlohmann_json 3.8 nlohmann_json/3.8.0" + "ZLIB 1.2 zlib/1.2.11" --- 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)