Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 16 Dec 2016 05:59:37 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428643 - in head/emulators/citra: . files
Message-ID:  <201612160559.uBG5xbMn019406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Fri Dec 16 05:59:37 2016
New Revision: 428643
URL: https://svnweb.freebsd.org/changeset/ports/428643

Log:
  emulators/citra: update to s20161216
  
  r428633 followup to drop -msse4.1 on 10.x.
  
  Changes:	https://github.com/citra-emu/citra/compare/0e032573...cda7210f

Added:
  head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp   (contents, props changed)
Modified:
  head/emulators/citra/Makefile   (contents, props changed)
  head/emulators/citra/distinfo   (contents, props changed)

Modified: head/emulators/citra/Makefile
==============================================================================
--- head/emulators/citra/Makefile	Fri Dec 16 05:30:15 2016	(r428642)
+++ head/emulators/citra/Makefile	Fri Dec 16 05:59:37 2016	(r428643)
@@ -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

Modified: head/emulators/citra/distinfo
==============================================================================
--- head/emulators/citra/distinfo	Fri Dec 16 05:30:15 2016	(r428642)
+++ head/emulators/citra/distinfo	Fri Dec 16 05:59:37 2016	(r428643)
@@ -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

Added: head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/citra/files/patch-src_video__core_shader_shader__jit__x64.cpp	Fri Dec 16 05:59:37 2016	(r428643)
@@ -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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612160559.uBG5xbMn019406>