Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Dec 2016 19:54:17 +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: r428633 - head/emulators/citra
Message-ID:  <201612151954.uBFJsH1k072669@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Dec 15 19:54:17 2016
New Revision: 428633
URL: https://svnweb.freebsd.org/changeset/ports/428633

Log:
  emulators/citra: update to s20161215
  
  Audio appears to work fine now.
  
  Changes:	https://github.com/citra-emu/citra/compare/07f65ad3...0e032573

Modified:
  head/emulators/citra/Makefile   (contents, props changed)
  head/emulators/citra/distinfo   (contents, props changed)

Modified: head/emulators/citra/Makefile
==============================================================================
--- head/emulators/citra/Makefile	Thu Dec 15 19:54:07 2016	(r428632)
+++ head/emulators/citra/Makefile	Thu Dec 15 19:54:17 2016	(r428633)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20161207
+PORTVERSION=	s20161215
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -28,17 +28,19 @@ ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dynarmic/issues/35
 
 USE_GITHUB=	yes
-GH_TUPLE=	citra-emu:${PORTNAME}:07f65ad3 \
+GH_TUPLE=	citra-emu:${PORTNAME}:0e032573 \
 		citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \
-		MerryMage:dynarmic:54d0519:dynarmic/externals/dynarmic \
+		MerryMage:dynarmic:34e19f1:dynarmic/externals/dynarmic \
 		fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \
-		herumi:xbyak:v3.71-440-gd62f6fb:xbyak/externals/dynarmic/externals/xbyak \
+		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
@@ -50,17 +52,21 @@ OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
 
 SDL_USE=	SDL=sdl2
 SDL_CMAKE_BOOL=	ENABLE_SDL2
-SDL_PLIST_FILES=bin/${PORTNAME}
+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

Modified: head/emulators/citra/distinfo
==============================================================================
--- head/emulators/citra/distinfo	Thu Dec 15 19:54:07 2016	(r428632)
+++ head/emulators/citra/distinfo	Thu Dec 15 19:54:17 2016	(r428633)
@@ -1,14 +1,14 @@
-TIMESTAMP = 1481052799
-SHA256 (citra-emu-citra-s20161207-07f65ad3_GH0.tar.gz) = 746eb6da9064cdeefe1a5eef4dd8c9de5dfc4937c09c24e221710ad8f6038ef2
-SIZE (citra-emu-citra-s20161207-07f65ad3_GH0.tar.gz) = 2222934
+TIMESTAMP = 1481819637
+SHA256 (citra-emu-citra-s20161215-0e032573_GH0.tar.gz) = f15c14493921f757a148badf1f744c71ef96ac465b27d3a2d8705eb3c59801c5
+SIZE (citra-emu-citra-s20161215-0e032573_GH0.tar.gz) = 2234072
 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb
 SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535
-SHA256 (MerryMage-dynarmic-54d0519_GH0.tar.gz) = a80a0620b5d5ee53c7ffd32a6c96d64497cefe7fcd05bc71e8e496b71d9f4582
-SIZE (MerryMage-dynarmic-54d0519_GH0.tar.gz) = 308093
+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-v3.71-440-gd62f6fb_GH0.tar.gz) = 9a3073910278520abc6509843462e542900524093155933fb75ace5dc6340e8d
-SIZE (herumi-xbyak-v3.71-440-gd62f6fb_GH0.tar.gz) = 202647
+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



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