Index: head/emulators/citra/Makefile =================================================================== --- head/emulators/citra/Makefile (revision 428642) +++ head/emulators/citra/Makefile (revision 428643) @@ -1,74 +1,72 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20161215 +PORTVERSION= s20161216 PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo 3DS emulator/debugger LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ LGPL21+ UNLICENSE LICENSE_COMB= multi 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_NAME_UNLICENSE= The Unlicense LICENSE_TEXT_UNLICENSE= See http://unlicense.org/ LICENSE_PERMS_UNLICENSE= ${_LICENSE_PERMS_PD} LICENSE_GROUPS_UNLICENSE= ${_LICENSE_GROUPS_PD} BUILD_DEPENDS= boost-libs>=1.57:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png # backend_x64/hostloc.h:93:8: fatal error: no type named 'Reg64' in namespace 'Xbyak' 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 \ herumi:xbyak:v5.40:xbyak/externals/xbyak \ neobrain:nihstro:26a0a04:nihstro/externals/nihstro \ philsquared:Catch:v1.4.0:catch/externals/catch \ svn2github:inih:603729d:inih/externals/inih/inih 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 OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} SDL_USE= SDL=sdl2 SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME} \ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=qmake_build,buildtools_build,core,gui,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ man/man6/${PORTNAME}-qt.6.gz \ share/applications/${PORTNAME}.desktop \ share/mime/packages/${PORTNAME}.xml \ share/pixmaps/${PORTNAME}.svg post-patch: @${REINPLACE_CMD} -e 's,share/man,man,' \ ${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/citra/distinfo =================================================================== --- head/emulators/citra/distinfo (revision 428642) +++ head/emulators/citra/distinfo (revision 428643) @@ -1,17 +1,17 @@ -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 SIZE (MerryMage-dynarmic-34e19f1_GH0.tar.gz) = 310706 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 (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 Index: head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp =================================================================== --- head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp (nonexistent) +++ head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp (revision 428643) @@ -0,0 +1,23 @@ +#include 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 + #include + #include +-#include + #include + #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); Property changes on: head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property