svn commit: r505393 - in head/emulators: . yuzu yuzu-qt5 yuzu/files
Jan Beich
jbeich at FreeBSD.org
Sun Jun 30 00:26:18 UTC 2019
Author: jbeich
Date: Sun Jun 30 00:26:16 2019
New Revision: 505393
URL: https://svnweb.freebsd.org/changeset/ports/505393
Log:
emulators/yuzu: add new port
PR: 228487
Submitted by: Greg V <greg at unrelenting.technology> (based on)
Added:
head/emulators/yuzu/
- copied from r505377, head/emulators/citra/
head/emulators/yuzu-qt5/
- copied from r505378, head/emulators/citra-qt5/
head/emulators/yuzu/files/patch-externals_unicorn_make.sh (contents, props changed)
head/emulators/yuzu/files/patch-libc++6 (contents, props changed)
Deleted:
head/emulators/yuzu/files/patch-externals_teakra_src_test.h
Modified:
head/emulators/Makefile
head/emulators/yuzu-qt5/Makefile
head/emulators/yuzu/Makefile
head/emulators/yuzu/distinfo
head/emulators/yuzu/files/patch-CMakeLists.txt
head/emulators/yuzu/pkg-descr
Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile Sat Jun 29 23:02:47 2019 (r505392)
+++ head/emulators/Makefile Sun Jun 30 00:26:16 2019 (r505393)
@@ -173,6 +173,8 @@
SUBDIR += xen-kernel47
SUBDIR += xhomer
SUBDIR += xsystem35
+ SUBDIR += yuzu
+ SUBDIR += yuzu-qt5
SUBDIR += xzx
SUBDIR += zsnes
Modified: head/emulators/yuzu-qt5/Makefile
==============================================================================
--- head/emulators/citra-qt5/Makefile Sat Jun 29 20:53:02 2019 (r505378)
+++ head/emulators/yuzu-qt5/Makefile Sun Jun 30 00:26:16 2019 (r505393)
@@ -3,7 +3,7 @@
PORTREVISION= 0
PKGNAMESUFFIX= -qt5
-MASTERDIR= ${.CURDIR}/../citra
+MASTERDIR= ${.CURDIR}/../yuzu
OPTIONS_SLAVE= QT5
Modified: head/emulators/yuzu/Makefile
==============================================================================
--- head/emulators/citra/Makefile Sat Jun 29 20:52:57 2019 (r505377)
+++ head/emulators/yuzu/Makefile Sun Jun 30 00:26:16 2019 (r505393)
@@ -1,14 +1,14 @@
# $FreeBSD$
-PORTNAME= citra
-PORTVERSION= s20190610
+PORTNAME= yuzu
+PORTVERSION= s20190629
PORTREVISION?= 0
CATEGORIES= emulators
MAINTAINER= jbeich at FreeBSD.org
-COMMENT= Nintendo 3DS emulator/debugger
+COMMENT= Nintendo Switch emulator/debugger
-LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ MIT OpenSSL UNLICENSE
+LICENSE= APACHE20 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ MIT OpenSSL UNLICENSE
LICENSE_COMB= multi
LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
@@ -16,36 +16,44 @@ LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.tx
LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt
LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE
LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch
-LICENSE_FILE_MIT= ${WRKSRC}/externals/enet/LICENSE
+LICENSE_FILE_LGPL3+ = ${_LICENSE_STORE}/LGPL3 # sirit
+LICENSE_FILE_MIT= ${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE
LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COPYING
-BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs
+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= citra-emu
-GH_TAGNAME= 73bf92fb3
-GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
- citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
- MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \
- arsenm:sanitizers-cmake:f09151b:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
- arun11299:cpp-jwt:v1.1.1:cpp_jwt/externals/cpp-jwt \
- benhoyt:inih:r42-6-g2023872:inih/externals/inih/inih \
+GH_ACCOUNT= yuzu-emu
+GH_TAGNAME= 1ca2b504b
+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.103:Vulkan_Headers/externals/Vulkan-Headers \
+ MerryMage:dynarmic:r1-1388-g2683a9a3: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:5.3.0:fmt/externals/fmt \
- herumi:xbyak:v5.71:xbyak/externals/xbyak \
- kinetiknz:cubeb:cubeb-0.2-1039-g44341a1:cubeb/externals/cubeb \
- lsalzman:enet:39a72ab:enet/externals/enet \
- neobrain:nihstro:fd69de1:nihstro/externals/nihstro \
- weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp \
- wwylele:teakra:e6ea0ea:teakra/externals/teakra
+ kinetiknz:cubeb:cubeb-0.2-1098-g6f2420d:cubeb/externals/cubeb \
+ lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \
+ ogniK5377:opus:v1.3-rc-20-g562f8ba5:opus/externals/opus \
+ svn2github:inih:603729d:inih/externals/inih/inih \
+ weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp
-USES= cmake compiler:c++17-lang iconv localbase:ldflags
+USES= cmake compiler:c++17-lang iconv localbase:ldflags python:2.7,build
USE_SDL= sdl2
LDFLAGS+= -Wl,--as-needed # Qt5Network
TEST_TARGET= test
-OPTIONS_DEFINE= ALSA FFMPEG PULSEAUDIO JACK SNDIO
-OPTIONS_DEFAULT=ALSA FFMPEG PULSEAUDIO JACK
+OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO
+OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK
OPTIONS_MULTI= GUI
OPTIONS_MULTI_GUI= QT5 SDL
OPTIONS_SLAVE?= SDL
@@ -55,9 +63,6 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
ALSA_CMAKE_BOOL= USE_ALSA
-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG
-
JACK_BUILD_DEPENDS= jackit>0:audio/jack
JACK_CMAKE_BOOL= USE_JACK
@@ -68,16 +73,13 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CMAKE_BOOL= USE_SNDIO
SDL_CMAKE_BOOL= ENABLE_SDL2
-SDL_PLIST_FILES=bin/${PORTNAME} \
- bin/${PORTNAME}-room \
- man/man6/${PORTNAME}.6.gz
+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,multimedia,opengl,widgets
-QT5_CMAKE_BOOL= ENABLE_QT
-QT5_PLIST_FILES=bin/${PORTNAME}-qt \
- "@comment bin/${PORTNAME}-room" \
- man/man6/${PORTNAME}-qt.6.gz \
+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
Modified: head/emulators/yuzu/distinfo
==============================================================================
--- head/emulators/citra/distinfo Sat Jun 29 20:52:57 2019 (r505377)
+++ head/emulators/yuzu/distinfo Sun Jun 30 00:26:16 2019 (r505393)
@@ -1,31 +1,37 @@
-TIMESTAMP = 1560175412
-SHA256 (citra-emu-citra-s20190610-73bf92fb3_GH0.tar.gz) = e6d26c3b595574e1ede4fcb3c4ed236fc6795f3d9332819c4845781e9ff3783e
-SIZE (citra-emu-citra-s20190610-73bf92fb3_GH0.tar.gz) = 5044723
+TIMESTAMP = 1561845347
+SHA256 (yuzu-emu-yuzu-s20190629-1ca2b504b_GH0.tar.gz) = 8e1dcc927db37427b30994f1d02bd2d28ac6c8bf4d4e67c91aa1f781a52b97bc
+SIZE (yuzu-emu-yuzu-s20190629-1ca2b504b_GH0.tar.gz) = 2672141
+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.103_GH0.tar.gz) = bea7adf4b460fec1b8676f88b262beb82fe9a69906e3a9e568ff5fa81ad0539f
+SIZE (KhronosGroup-Vulkan-Headers-v1.1.103_GH0.tar.gz) = 559445
+SHA256 (MerryMage-dynarmic-r1-1388-g2683a9a3_GH0.tar.gz) = bbf296c19d3215435582da804948387bfa6bedd16fd8db2b56af4a618400db38
+SIZE (MerryMage-dynarmic-r1-1388-g2683a9a3_GH0.tar.gz) = 1444605
+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 (MerryMage-dynarmic-r1-992-g4e6848d1_GH0.tar.gz) = 1dd65997fce183976de08904c1097f3a4d2dfbdf59e69a492b1b8c4271973511
-SIZE (MerryMage-dynarmic-r1-992-g4e6848d1_GH0.tar.gz) = 1446282
-SHA256 (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 40d826a6c98fdedf1097bdb96944b2905be507ed5d11e74480680d459fc22431
-SIZE (arsenm-sanitizers-cmake-f09151b_GH0.tar.gz) = 6856
-SHA256 (arun11299-cpp-jwt-v1.1.1_GH0.tar.gz) = 6dbf93969ec48d97ecb6c157014985846df8c01995a0011c21f4e2c146594922
-SIZE (arun11299-cpp-jwt-v1.1.1_GH0.tar.gz) = 1231375
-SHA256 (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 7ea50578066fbcff2c33a303850eb165f0aeb4dc0af1dcf0e068b3ad6acc7fea
-SIZE (benhoyt-inih-r42-6-g2023872_GH0.tar.gz) = 12913
-SHA256 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f
-SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374
+SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3
+SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233
SHA256 (fmtlib-fmt-5.3.0_GH0.tar.gz) = defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
SIZE (fmtlib-fmt-5.3.0_GH0.tar.gz) = 662493
-SHA256 (herumi-xbyak-v5.71_GH0.tar.gz) = 27e5dd6f7fa7194802db9194b893f94b64edf6e585bf567feebb2b15baf11008
-SIZE (herumi-xbyak-v5.71_GH0.tar.gz) = 213882
-SHA256 (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = b3814177e98a26806a8c224b1994c7d2026708d149a3fc835d020595c88d32e1
-SIZE (kinetiknz-cubeb-cubeb-0.2-1039-g44341a1_GH0.tar.gz) = 194990
-SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1
-SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471
-SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a
-SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417
+SHA256 (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = f13de26eb3bdf4bf328ca199e78b242b10f750ce29c064ac650995e62e520e28
+SIZE (kinetiknz-cubeb-cubeb-0.2-1098-g6f2420d_GH0.tar.gz) = 202308
+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 (ogniK5377-opus-v1.3-rc-20-g562f8ba5_GH0.tar.gz) = ca2600f52cc4c65f5b99b80c94399d89a43e199ebcd9e4ea6e7159dfc6f25b49
+SIZE (ogniK5377-opus-v1.3-rc-20-g562f8ba5_GH0.tar.gz) = 822137
+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 (wwylele-teakra-e6ea0ea_GH0.tar.gz) = 114851491219d09dd116e34ffce2432c3b83f8869080dcbe24e9a99850df37a3
-SIZE (wwylele-teakra-e6ea0ea_GH0.tar.gz) = 562458
Modified: head/emulators/yuzu/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/citra/files/patch-CMakeLists.txt Sat Jun 29 20:52:57 2019 (r505377)
+++ head/emulators/yuzu/files/patch-CMakeLists.txt Sun Jun 30 00:26:16 2019 (r505393)
@@ -1,8 +1,8 @@
-citra-qt currently needs SDL for audio and input
+yuzu (Qt) currently needs SDL for input
---- CMakeLists.txt.orig 2017-08-09 15:54:29 UTC
+--- CMakeLists.txt.orig 2019-06-28 18:03:38 UTC
+++ CMakeLists.txt
-@@ -207,15 +207,15 @@ if (ENABLE_SDL2)
+@@ -145,15 +145,15 @@ if (ENABLE_SDL2)
else()
find_package(SDL2 REQUIRED)
endif()
@@ -25,4 +25,4 @@ citra-qt currently needs SDL for audio and input
+ target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
endif()
- if (ENABLE_QT)
+ # If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external
Added: head/emulators/yuzu/files/patch-externals_unicorn_make.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/yuzu/files/patch-externals_unicorn_make.sh Sun Jun 30 00:26:16 2019 (r505393)
@@ -0,0 +1,35 @@
+- DragonFly also has BSD make as make(1)
+- Build verbosely to help debugging *FLAGS
+- Ignore -lpthread underlinking (on WITHOUT_LLD_IS_LD) in unused samples
+
+--- externals/unicorn/make.sh.orig 2018-01-04 00:41:12 UTC
++++ externals/unicorn/make.sh
+@@ -112,7 +112,7 @@ if [ "$UNAME" = SunOS ]; then
+ CC=gcc
+ fi
+
+-if [ -n "`echo "$UNAME" | grep BSD`" ]; then
++if [ -n "`echo "$UNAME" | grep -e DragonFly -e BSD`" ]; then
+ MAKE=gmake
+ PREFIX="${PREFIX-/usr/local}"
+ fi
+@@ -120,15 +120,15 @@ fi
+ export CC INSTALL_BIN PREFIX PKGCFGDIR LIBDIRARCH LIBARCHS CFLAGS LDFLAGS
+
+ case "$1" in
+- "" ) ${MAKE};;
++ "" ) ${MAKE} V=1 unicorn;;
+ "asan" ) asan;;
+ "install" ) install;;
+ "uninstall" ) uninstall;;
+- "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE};;
+- "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};;
++ "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE} V=1 unicorn;;
++ "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE} V=1 unicorn;;
+ "cross-win32" ) build_cross i686-w64-mingw32;;
+ "cross-win64" ) build_cross x86_64-w64-mingw32;;
+- "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};;
++ "cross-android" ) CROSS=arm-linux-androideabi ${MAKE} V=1 unicorn;;
+ "ios" ) build_iOS;;
+ "ios_armv7" ) build_iOS armv7;;
+ "ios_armv7s" ) build_iOS armv7s;;
Added: head/emulators/yuzu/files/patch-libc++6
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/yuzu/files/patch-libc++6 Sun Jun 30 00:26:16 2019 (r505393)
@@ -0,0 +1,181 @@
+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 <class _Tp, size_t _Size> 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
+@@ -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<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -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<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -12,6 +12,16 @@
+ #include "common/bit_util.h"
+ #include "frontend/A64/types.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -13,6 +13,16 @@
+
+ #include "frontend/ir/type.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -16,6 +16,16 @@
+ #include "core/file_sys/vfs_offset.h"
+ #include "core/loader/loader.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
++++ src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+@@ -20,6 +20,16 @@
+ #include "video_core/renderer_opengl/gl_shader_decompiler.h"
+ #include "video_core/shader/shader_ir.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -10,6 +10,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<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), void>::type
++ >
++array(_Tp, _Args...)
++ -> array<_Tp, 1 + sizeof...(_Args)>;
++_LIBCPP_END_NAMESPACE_STD
++#endif
++
+ namespace Vulkan {
+
+ namespace Alternatives {
+--- src/yuzu/configuration/configure_gamelist.cpp.orig 2019-06-28 18:03:38 UTC
++++ src/yuzu/configuration/configure_gamelist.cpp
+@@ -11,6 +11,16 @@
+ #include "yuzu/configuration/configure_gamelist.h"
+ #include "yuzu/ui_settings.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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
+@@ -7,6 +7,16 @@
+ #include <QPainter>
+ #include "yuzu/util/util.h"
+
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 7000
++_LIBCPP_BEGIN_NAMESPACE_STD
++template<class _Tp, class... _Args,
++ class = typename enable_if<(is_same_v<_Tp, _Args> && ...), 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"
Modified: head/emulators/yuzu/pkg-descr
==============================================================================
--- head/emulators/citra/pkg-descr Sat Jun 29 20:52:57 2019 (r505377)
+++ head/emulators/yuzu/pkg-descr Sun Jun 30 00:26:16 2019 (r505393)
@@ -1,10 +1,12 @@
-Citra is an experimental open-source Nintendo 3DS emulator/debugger
-written in C++. It is written with portability in mind, with builds
-actively maintained for Windows, Linux and OS X. Citra only emulates a
-subset of 3DS hardware, and therefore is generally only useful for
-running/debugging homebrew applications. At this time, Citra is even
-able to boot several commercial games! Most of these do not run to a
-playable state, but we are working every day to advance the project
-forward.
+yuzu is an experimental open-source emulator for the Nintendo Switch
+from the creators of Citra.
-WWW: https://citra-emu.org
+It is written in C++ with portability in mind, with builds actively
+maintained for Windows, Linux and macOS. The emulator is currently
+only useful for homebrew development and research purposes.
+
+yuzu only emulates a subset of Switch hardware and therefore is
+generally only useful for running/debugging homebrew
+applications. yuzu can boot some games, to varying degrees of success.
+
+WWW: https://yuzu-emu.org/
More information about the svn-ports-head
mailing list