emulators/yuzu: update to s20191124

Changes:	6a3fc5d2f...6d23b045a
This commit is contained in:
Jan Beich 2019-11-26 00:43:11 +00:00
parent 1b2c142cc0
commit b7da4d31f9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=518437
3 changed files with 48 additions and 29 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= yuzu
PORTVERSION= s20191123
PORTVERSION= s20191124
PORTREVISION?= 0
CATEGORIES= emulators
@ -28,7 +28,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \
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 \

View File

@ -1,6 +1,6 @@
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

View File

@ -8,7 +8,7 @@ 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.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"
@ -27,7 +27,7 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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"
@ -46,10 +46,10 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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
@ -65,9 +65,9 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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"
@ -84,10 +84,10 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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
@ -102,11 +102,30 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
+
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<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 {
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
@ -122,9 +141,9 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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"
@ -140,11 +159,11 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
+
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
@ -160,7 +179,7 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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"
@ -179,11 +198,11 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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
@ -198,7 +217,7 @@ template <class _Tp, size_t _Size> struct _LIBCPP_TEMPLATE_VIS array;
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 <QPainter>