diff options
Diffstat (limited to 'emulators/citra')
-rw-r--r-- | emulators/citra/Makefile | 13 | ||||
-rw-r--r-- | emulators/citra/distinfo | 16 | ||||
-rw-r--r-- | emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp | 23 | ||||
-rw-r--r-- | emulators/citra/files/patch-src_video__core_shader_shader__jit__x64__compiler.cpp | 17 |
4 files changed, 33 insertions, 36 deletions
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 28abc4d89f63..71e96e7ee41e 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20170119 +PORTVERSION= s20170221 PORTREVISION?= 0 CATEGORIES= emulators @@ -14,7 +14,7 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/dynarmic/externals/fmt/LICENSE.rst LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE_1_0.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt -LICENSE_FILE_LGPL21+ = ${WRKSRC}/externals/qhexedit/license.txt +LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_NAME_UNLICENSE= The Unlicense LICENSE_TEXT_UNLICENSE= See http://unlicense.org/ LICENSE_PERMS_UNLICENSE= ${_LICENSE_PERMS_PD} @@ -28,14 +28,15 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes -GH_TUPLE= citra-emu:${PORTNAME}:ebe01506 \ +GH_TUPLE= citra-emu:${PORTNAME}:e971f17bb \ citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \ - MerryMage:dynarmic:3608208:dynarmic/externals/dynarmic \ + MerryMage:dynarmic:358cf7c:dynarmic/externals/dynarmic \ fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \ herumi:xbyak:v5.40:xbyak/externals/xbyak \ - neobrain:nihstro:26a0a04:nihstro/externals/nihstro \ + neobrain:nihstro:7e24743:nihstro/externals/nihstro \ philsquared:Catch:v1.4.0:catch/externals/catch \ - svn2github:inih:603729d:inih/externals/inih/inih + svn2github:inih:603729d:inih/externals/inih/inih \ + weidai11:cryptopp:CRYPTOPP_5_6_5-164-g841c37e:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags FAVORITE_COMPILER= ${COMPILER_TYPE} # c++14-lib diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 9ee8d3b126f9..1bba065167cb 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,17 +1,19 @@ -TIMESTAMP = 1484800259 -SHA256 (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = c244491e17669342f960162905f74699a985384afdb51986c44ba8ac4133d440 -SIZE (citra-emu-citra-s20170119-ebe01506_GH0.tar.gz) = 2240677 +TIMESTAMP = 1487713654 +SHA256 (citra-emu-citra-s20170221-e971f17bb_GH0.tar.gz) = e4fe8be51806412f024ee39a4f7d7f5f6470666de2d3960157e1a6527bc221b5 +SIZE (citra-emu-citra-s20170221-e971f17bb_GH0.tar.gz) = 2217236 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535 -SHA256 (MerryMage-dynarmic-3608208_GH0.tar.gz) = 1376b8d6f91808f42a4d4a0be85f88c0b99200a704ed64b62814cb1836cb40d1 -SIZE (MerryMage-dynarmic-3608208_GH0.tar.gz) = 315933 +SHA256 (MerryMage-dynarmic-358cf7c_GH0.tar.gz) = ba3efc77df14473e20fc1bead08725d0d5a67ff71726cf749e6d3970f7e7ca03 +SIZE (MerryMage-dynarmic-358cf7c_GH0.tar.gz) = 321864 SHA256 (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = e5b0b3055082d9dc2b56509d8a11032fdeb3ab846feb5369591ccf58593446f9 SIZE (fmtlib-fmt-3.0.0-146-g796beaa_GH0.tar.gz) = 612701 SHA256 (herumi-xbyak-v5.40_GH0.tar.gz) = 106bbe15dc7e5d025ff98d1b5dd62a3f0a26d2569debe77fcde14852d50a66e1 SIZE (herumi-xbyak-v5.40_GH0.tar.gz) = 203521 -SHA256 (neobrain-nihstro-26a0a04_GH0.tar.gz) = 8d94e57f5a9aebf976e4df3c7a0c69d4a0c4a6f2c3d0e4d464a7f09a826b345f -SIZE (neobrain-nihstro-26a0a04_GH0.tar.gz) = 110136 +SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650 +SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273 SHA256 (philsquared-Catch-v1.4.0_GH0.tar.gz) = b225e9828291636745db75e42cd604b8d755dcad0c5235fc90d7c725c4b49fb1 SIZE (philsquared-Catch-v1.4.0_GH0.tar.gz) = 311263 SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342 +SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-164-g841c37e_GH0.tar.gz) = 70ea37578cc7eebcfa4c621c7f61c2a255c895156064eba1c33053b1d01a95ee +SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-164-g841c37e_GH0.tar.gz) = 6912141 diff --git a/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp b/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp deleted file mode 100644 index d2a3d5d782cb..000000000000 --- a/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include <smmintrin.h> fails without -msse4.1 on Clang < 3.8 - -https://github.com/llvm-mirror/clang/commit/41885d36e85ead75a1d18ef7d2f43663f90ed67e - ---- src/video_core/shader/shader_jit_x64.cpp.orig 2016-12-16 05:41:22 UTC -+++ src/video_core/shader/shader_jit_x64.cpp -@@ -6,7 +6,6 @@ - #include <cmath> - #include <cstdint> - #include <nihstro/shader_bytecode.h> --#include <smmintrin.h> - #include <xmmintrin.h> - #include "common/assert.h" - #include "common/logging/log.h" -@@ -499,7 +498,7 @@ void JitShader::Compile_FLR(Instruction - Compile_SwizzleSrc(instr, 1, instr.common.src1, SRC1); - - if (Common::GetCPUCaps().sse4_1) { -- roundps(SRC1, SRC1, _MM_FROUND_FLOOR); -+ roundps(SRC1, SRC1, Gen::FROUND_FLOOR); - } else { - cvttps2dq(SRC1, SRC1); - cvtdq2ps(SRC1, SRC1); diff --git a/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64__compiler.cpp b/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64__compiler.cpp new file mode 100644 index 000000000000..a5244a73b98f --- /dev/null +++ b/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64__compiler.cpp @@ -0,0 +1,17 @@ +https://github.com/llvm-mirror/clang/commit/41885d36e85ead75a1d18ef7d2f43663f90ed67e + +--- src/video_core/shader/shader_jit_x64_compiler.cpp.orig 2017-02-21 21:47:34 UTC ++++ src/video_core/shader/shader_jit_x64_compiler.cpp +@@ -6,7 +6,12 @@ + #include <cmath> + #include <cstdint> + #include <nihstro/shader_bytecode.h> ++#if defined(__clang__) && (__clang_major__ == 3 && __clang_minor__ < 8) ++// <smmintrin.h> requires -msse4.1 with Clang before 3.8 ++#define _MM_FROUND_FLOOR 0x01 ++#else + #include <smmintrin.h> ++#endif + #include <xmmintrin.h> + #include "common/assert.h" + #include "common/logging/log.h" |