Index: head/emulators/yuzu/Makefile =================================================================== --- head/emulators/yuzu/Makefile (revision 518436) +++ head/emulators/yuzu/Makefile (revision 518437) @@ -1,98 +1,98 @@ # $FreeBSD$ PORTNAME= yuzu -PORTVERSION= s20191123 +PORTVERSION= s20191124 PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger LICENSE= APACHE20 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/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 LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COPYING ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 ONLY_FOR_ARCHS_REASON= requires int128 BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \ gmake:devel/gmake USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 6a3fc5d2f +GH_TAGNAME= 6d23b045a GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \ DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.1.117:Vulkan_Headers/externals/Vulkan-Headers \ MerryMage:dynarmic:r1-1436-g087a7441:dynarmic/externals/dynarmic \ ReinUsesLisp:sirit:f7c4b07:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ catchorg:Catch2:v2.3.0:catch/externals/catch \ citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ facebook:zstd:v1.3.8:zstd/externals/zstd \ fmtlib:fmt:6.0.0-56-g4b8f8fac:fmt/externals/fmt \ kinetiknz:cubeb:cubeb-0.2-1151-g9eb4c89:cubeb/externals/cubeb \ lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \ madler:zlib:v1.2.11:zlib/externals/zlib/zlib \ nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \ svn2github:inih:603729d:inih/externals/inih/inih \ weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp \ xiph:opus:v1.3.1-4-gad8fe90d:opus/externals/opus/opus USES= cmake compiler:c++17-lang iconv localbase:ldflags \ python:2.7,build sdl USE_SDL= sdl2 LDFLAGS+= -Wl,--as-needed # Qt5Network TEST_TARGET= test OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK SNDIO 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_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins 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 \ bin/${PORTNAME}-tester QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=qmake_build,buildtools_build,concurrent_build,core,gui,opengl,webengine,widgets QT5_CMAKE_BOOL= ENABLE_QT 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 post-patch: @${REINPLACE_CMD} -e 's,share/man,man,' \ -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 Index: head/emulators/yuzu/distinfo =================================================================== --- head/emulators/yuzu/distinfo (revision 518436) +++ head/emulators/yuzu/distinfo (revision 518437) @@ -1,41 +1,41 @@ -TIMESTAMP = 1574533479 -SHA256 (yuzu-emu-yuzu-s20191123-6a3fc5d2f_GH0.tar.gz) = 68e42b8b93854f0407cc89257e3751ea1f8755a519a067177e46f51e158d5601 -SIZE (yuzu-emu-yuzu-s20191123-6a3fc5d2f_GH0.tar.gz) = 2610713 +TIMESTAMP = 1574654631 +SHA256 (yuzu-emu-yuzu-s20191124-6d23b045a_GH0.tar.gz) = 5ff48c6e930acd9af38d62f823f59e3c7aa8e1d1152dd143a3cae6e28ebc2981 +SIZE (yuzu-emu-yuzu-s20191124-6d23b045a_GH0.tar.gz) = 2612624 SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254 SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7 SIZE (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 2283313 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 SHA256 (KhronosGroup-Vulkan-Headers-v1.1.117_GH0.tar.gz) = fae9fe671de4c7d1b3445fa1516215f57869207394cfa20f8162f2bf8bd8ab6d SIZE (KhronosGroup-Vulkan-Headers-v1.1.117_GH0.tar.gz) = 635399 SHA256 (MerryMage-dynarmic-r1-1436-g087a7441_GH0.tar.gz) = d8a5e497859a9cc8c5ae2158b2caad51ddfce892862953a9ed837a9ce7ca9fa8 SIZE (MerryMage-dynarmic-r1-1436-g087a7441_GH0.tar.gz) = 1462669 SHA256 (ReinUsesLisp-sirit-f7c4b07_GH0.tar.gz) = 49d2528404ef1ac89e76f48eb49ec708693ea939d0d07458f936f57f4a04b679 SIZE (ReinUsesLisp-sirit-f7c4b07_GH0.tar.gz) = 21172 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514 SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3 SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233 SHA256 (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = f9ea86d434fe49d50ee62d9a4166ece47872690a2d60956252103dff9c722d2e SIZE (fmtlib-fmt-6.0.0-56-g4b8f8fac_GH0.tar.gz) = 713067 SHA256 (kinetiknz-cubeb-cubeb-0.2-1151-g9eb4c89_GH0.tar.gz) = 34c7bf4566c49a4e827da707113f3113a35534d76e5a48dbf9e1632f7c786b16 SIZE (kinetiknz-cubeb-cubeb-0.2-1151-g9eb4c89_GH0.tar.gz) = 193511 SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5 SIZE (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 222985 SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) = 629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff SIZE (madler-zlib-v1.2.11_GH0.tar.gz) = 644492 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 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342 SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 1d6f029b83a230561e75bab26b5aaf98055b8439363a25bf113ac9ff6f9d2ef4 SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489 SHA256 (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = a5169e4de7266dca46f8fe08cdc3b9d331c14eaaffc7d9d8abc02d70c4f555da SIZE (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = 828993 Index: head/emulators/yuzu/files/patch-libc++6 =================================================================== --- head/emulators/yuzu/files/patch-libc++6 (revision 518436) +++ head/emulators/yuzu/files/patch-libc++6 (revision 518437) @@ -1,219 +1,238 @@ Drop after FreeBSD 12.0 EOL. See https://reviews.llvm.org/rL332768 externals/dynarmic/src/frontend/A64/types.cpp:18:33: fatal error: no viable constructor or deduction guide for deduction of template arguments of 'array' static constexpr std::array cond_strs = { ^ /usr/include/c++/v1/__tuple:223:64: note: candidate function template not viable: requires 0 arguments, but 16 were provided template struct _LIBCPP_TEMPLATE_VIS array; ^ /usr/include/c++/v1/__tuple:223:64: note: candidate function template not viable: requires 1 argument, but 16 were provided ---- externals/dynarmic/src/frontend/A32/disassembler/disassembler_arm.cpp.orig 2019-05-07 07:17:43 UTC +--- externals/dynarmic/src/frontend/A32/disassembler/disassembler_arm.cpp.orig 2019-08-14 20:14:23 UTC +++ externals/dynarmic/src/frontend/A32/disassembler/disassembler_arm.cpp @@ -18,6 +18,16 @@ #include "frontend/A32/disassembler/disassembler.h" #include "frontend/A32/types.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Dynarmic::A32 { class DisassemblerVisitor { ---- externals/dynarmic/src/frontend/A32/types.cpp.orig 2019-05-07 07:17:43 UTC +--- externals/dynarmic/src/frontend/A32/types.cpp.orig 2019-08-14 20:14:23 UTC +++ externals/dynarmic/src/frontend/A32/types.cpp @@ -10,6 +10,16 @@ #include "common/bit_util.h" #include "frontend/A32/types.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Dynarmic::A32 { const char* CondToString(Cond cond, bool explicit_al) { ---- externals/dynarmic/src/frontend/A64/types.cpp.orig 2019-05-07 07:17:43 UTC +--- externals/dynarmic/src/frontend/A64/types.cpp.orig 2019-08-14 20:14:23 UTC +++ externals/dynarmic/src/frontend/A64/types.cpp -@@ -12,6 +12,16 @@ - #include "common/bit_util.h" +@@ -11,6 +11,16 @@ + #include "frontend/A64/types.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Dynarmic::A64 { const char* CondToString(Cond cond) { ---- externals/dynarmic/src/frontend/ir/type.cpp.orig 2019-05-07 07:17:43 UTC +--- externals/dynarmic/src/frontend/ir/type.cpp.orig 2019-08-14 20:14:23 UTC +++ externals/dynarmic/src/frontend/ir/type.cpp -@@ -13,6 +13,16 @@ +@@ -10,6 +10,16 @@ #include "frontend/ir/type.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Dynarmic::IR { std::string GetNameOf(Type type) { ---- src/core/file_sys/card_image.cpp.orig 2019-06-28 18:03:38 UTC +--- src/core/file_sys/card_image.cpp.orig 2019-11-25 04:03:51 UTC +++ src/core/file_sys/card_image.cpp -@@ -16,6 +16,16 @@ - #include "core/file_sys/vfs_offset.h" +@@ -19,6 +19,16 @@ + #include "core/file_sys/vfs_vector.h" #include "core/loader/loader.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace FileSys { - constexpr std::array partition_names{ ---- src/video_core/renderer_opengl/gl_shader_decompiler.cpp.orig 2019-06-28 18:03:38 UTC + constexpr u64 GAMECARD_CERTIFICATE_OFFSET = 0x7000; +--- src/video_core/renderer_opengl/gl_device.cpp.orig 2019-11-25 04:03:51 UTC ++++ src/video_core/renderer_opengl/gl_device.cpp +@@ -15,6 +15,16 @@ + #include "video_core/renderer_opengl/gl_device.h" + #include "video_core/renderer_opengl/gl_resource_manager.h" + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 ++_LIBCPP_BEGIN_NAMESPACE_STD ++template && ...), void>::type ++ > ++array(_Tp, _Args...) ++ -> array<_Tp, 1 + sizeof...(_Args)>; ++_LIBCPP_END_NAMESPACE_STD ++#endif ++ + namespace OpenGL { + + namespace { +--- src/video_core/renderer_opengl/gl_shader_decompiler.cpp.orig 2019-11-25 04:03:51 UTC +++ src/video_core/renderer_opengl/gl_shader_decompiler.cpp -@@ -20,6 +20,16 @@ - #include "video_core/renderer_opengl/gl_shader_decompiler.h" +@@ -24,6 +24,16 @@ + #include "video_core/shader/node.h" #include "video_core/shader/shader_ir.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace OpenGL::GLShader { namespace { ---- src/video_core/renderer_vulkan/vk_device.cpp.orig 2019-06-28 18:03:38 UTC +--- src/video_core/renderer_vulkan/vk_device.cpp.orig 2019-11-25 04:03:51 UTC +++ src/video_core/renderer_vulkan/vk_device.cpp -@@ -10,6 +10,16 @@ +@@ -11,6 +11,16 @@ #include "video_core/renderer_vulkan/declarations.h" #include "video_core/renderer_vulkan/vk_device.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Vulkan { - namespace Alternatives { ---- src/video_core/renderer_vulkan/vk_shader_decompiler.cpp.orig 2019-07-22 15:12:55 UTC + namespace { +--- src/video_core/renderer_vulkan/vk_shader_decompiler.cpp.orig 2019-11-25 04:03:51 UTC +++ src/video_core/renderer_vulkan/vk_shader_decompiler.cpp -@@ -21,6 +21,16 @@ - #include "video_core/renderer_vulkan/vk_shader_decompiler.h" +@@ -23,6 +23,16 @@ + #include "video_core/shader/node.h" #include "video_core/shader/shader_ir.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace Vulkan::VKShader { using Sirit::Id; ---- src/video_core/shader/shader_ir.cpp.orig 2019-10-26 19:56:13 UTC +--- src/video_core/shader/shader_ir.cpp.orig 2019-11-25 04:03:51 UTC +++ src/video_core/shader/shader_ir.cpp @@ -13,6 +13,16 @@ #include "video_core/shader/node_helper.h" #include "video_core/shader/shader_ir.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace VideoCommon::Shader { using Tegra::Shader::Attribute; ---- src/yuzu/configuration/configure_gamelist.cpp.orig 2019-06-28 18:03:38 UTC +--- src/yuzu/configuration/configure_gamelist.cpp.orig 2019-11-25 04:03:51 UTC +++ src/yuzu/configuration/configure_gamelist.cpp @@ -11,6 +11,16 @@ #include "yuzu/configuration/configure_gamelist.h" - #include "yuzu/ui_settings.h" + #include "yuzu/uisettings.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + namespace { constexpr std::array default_icon_sizes{ std::make_pair(0, QT_TR_NOOP("None")), ---- src/yuzu/util/util.cpp.orig 2019-06-28 18:03:38 UTC +--- src/yuzu/util/util.cpp.orig 2019-11-25 04:03:51 UTC +++ src/yuzu/util/util.cpp @@ -7,6 +7,16 @@ #include #include "yuzu/util/util.h" +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000 +_LIBCPP_BEGIN_NAMESPACE_STD +template && ...), void>::type + > +array(_Tp, _Args...) + -> array<_Tp, 1 + sizeof...(_Args)>; +_LIBCPP_END_NAMESPACE_STD +#endif + QFont GetMonospaceFont() { QFont font(QStringLiteral("monospace")); // Automatic fallback to a monospace font on on platforms without a font called "monospace"