diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-12-16 13:59:37 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-12-16 13:59:37 +0800 |
| commit | 811744e1e645fa320de232acb0bdb927c86c90ad (patch) | |
| tree | 8c4a1621987f360da34ad5ce0555688b85b45f72 /emulators | |
| parent | dac6925b72c85d811e9a9155f253745d59a39376 (diff) | |
| download | freebsd-ports-gnome-811744e1e645fa320de232acb0bdb927c86c90ad.tar.gz freebsd-ports-gnome-811744e1e645fa320de232acb0bdb927c86c90ad.tar.zst freebsd-ports-gnome-811744e1e645fa320de232acb0bdb927c86c90ad.zip | |
emulators/citra: update to s20161216
r428633 followup to drop -msse4.1 on 10.x.
Changes: https://github.com/citra-emu/citra/compare/0e032573...cda7210f
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/citra/Makefile | 6 | ||||
| -rw-r--r-- | emulators/citra/distinfo | 6 | ||||
| -rw-r--r-- | emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp | 23 |
3 files changed, 28 insertions, 7 deletions
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 14883b17282a..1d4117b202b0 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20161215 +PORTVERSION= s20161216 PORTREVISION?= 0 CATEGORIES= emulators @@ -28,7 +28,7 @@ ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35 USE_GITHUB= yes -GH_TUPLE= citra-emu:${PORTNAME}:0e032573 \ +GH_TUPLE= citra-emu:${PORTNAME}:cda7210f \ citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \ MerryMage:dynarmic:34e19f1:dynarmic/externals/dynarmic \ fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \ @@ -39,8 +39,6 @@ GH_TUPLE= citra-emu:${PORTNAME}:0e032573 \ USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags FAVORITE_COMPILER= ${COMPILER_TYPE} # c++14-lib -CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}_${COMPILER_VERSION}} -CFLAGS_clang_34=-msse4.1 # See LLVM r239883 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # GL diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 90592ce4c69b..bb34c5070810 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1481819637 -SHA256 (citra-emu-citra-s20161215-0e032573_GH0.tar.gz) = f15c14493921f757a148badf1f744c71ef96ac465b27d3a2d8705eb3c59801c5 -SIZE (citra-emu-citra-s20161215-0e032573_GH0.tar.gz) = 2234072 +TIMESTAMP = 1481866882 +SHA256 (citra-emu-citra-s20161216-cda7210f_GH0.tar.gz) = f758274addb86b70a5fb75ec47d737eccfaa9f87b7c4183d45e594c084fee443 +SIZE (citra-emu-citra-s20161216-cda7210f_GH0.tar.gz) = 2234713 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535 SHA256 (MerryMage-dynarmic-34e19f1_GH0.tar.gz) = bf1c4c7a34e722bdbea1d70b858b8ee466d2e3a9fdc275094aaeb6baa22ecfae 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 new file mode 100644 index 000000000000..d2a3d5d782cb --- /dev/null +++ b/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp @@ -0,0 +1,23 @@ +#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); |