svn commit: r461853 - in branches/2018Q1/emulators/citra: . files

[Jan Beich]

Author: jbeich
Date: Thu Feb 15 01:00:27 2018
New Revision: 461853
URL: https://svnweb.freebsd.org/changeset/ports/461853

Log:
  MFH: r461851
  
  emulators/citra: update to s20180214
  
  Changes:	https://github.com/citra-emu/citra/compare/3c03da12...775fb388
  Approved by:	ports-secteam (swills, implicit for snapshots)

Modified:
  branches/2018Q1/emulators/citra/Makefile
  branches/2018Q1/emulators/citra/distinfo
  branches/2018Q1/emulators/citra/files/patch-CMakeLists.txt
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/emulators/citra/Makefile
==============================================================================
--- branches/2018Q1/emulators/citra/Makefile	Thu Feb 15 00:59:54 2018	(r461852)
+++ branches/2018Q1/emulators/citra/Makefile	Thu Feb 15 01:00:27 2018	(r461853)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20180208
+PORTVERSION=	s20180214
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	3c03da12
+GH_TAGNAME=	775fb388
 GH_TUPLE=	citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \
 		benhoyt:inih:r40:inih/externals/inih/inih \
@@ -35,7 +35,7 @@ GH_TUPLE=	citra-emu:ext-soundtouch:019d208:soundtouch/
 		herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \
 		lsalzman:enet:39a72ab:enet/externals/enet \
 		neobrain:nihstro:fd69de1:nihstro/externals/nihstro \
-		weidai11:cryptopp:CRYPTOPP_5_6_5-610-g24bc2b8:cryptopp/externals/cryptopp/cryptopp
+		weidai11:cryptopp:CRYPTOPP_6_0_0:cryptopp/externals/cryptopp/cryptopp
 
 USES=		cmake:outsource compiler:c++14-lang iconv localbase:ldflags
 USE_SDL=	sdl2

Modified: branches/2018Q1/emulators/citra/distinfo
==============================================================================
--- branches/2018Q1/emulators/citra/distinfo	Thu Feb 15 00:59:54 2018	(r461852)
+++ branches/2018Q1/emulators/citra/distinfo	Thu Feb 15 01:00:27 2018	(r461853)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1518108370
-SHA256 (citra-emu-citra-s20180208-3c03da12_GH0.tar.gz) = 42d61d7f373328bb3f05fb0f5c234a81403cc8991ddeb9f21f25d7a68e8acf11
-SIZE (citra-emu-citra-s20180208-3c03da12_GH0.tar.gz) = 1675073
+TIMESTAMP = 1518622346
+SHA256 (citra-emu-citra-s20180214-775fb388_GH0.tar.gz) = 69b686ba1c1b69e87a4fea5f894e0bd77c97b66ae4b2e3df962fec47985073da
+SIZE (citra-emu-citra-s20180214-775fb388_GH0.tar.gz) = 1675167
 SHA256 (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = f48c211bbabe7ad79e1c504af1082756c74241be6bab4aca13140803f4b694e7
 SIZE (citra-emu-ext-soundtouch-019d208_GH0.tar.gz) = 59366
 SHA256 (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = cf120bc77912cf58e0965db2abcb2067c36aca612c42459e0eb72b740ea6cb0e
@@ -17,7 +17,7 @@ SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447
 SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471
 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a
 SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417
-SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 9f3f59538ba0515307e142ab404d65270da709aa3ac906770ec658e47a277ec2
-SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-610-g24bc2b8_GH0.tar.gz) = 7008104
+SHA256 (weidai11-cryptopp-CRYPTOPP_6_0_0_GH0.tar.gz) = ed951973ae4f4d52edcf25882fa5238145a00adc81edb9d7be4ce7b9aa744269
+SIZE (weidai11-cryptopp-CRYPTOPP_6_0_0_GH0.tar.gz) = 7158162
 SHA256 (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 84ea509dc08766d7182b867b78ba6dd16f3352d85b18b0654661079b8617dae4
 SIZE (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 34100

Modified: branches/2018Q1/emulators/citra/files/patch-CMakeLists.txt
==============================================================================
--- branches/2018Q1/emulators/citra/files/patch-CMakeLists.txt	Thu Feb 15 00:59:54 2018	(r461852)
+++ branches/2018Q1/emulators/citra/files/patch-CMakeLists.txt	Thu Feb 15 01:00:27 2018	(r461853)
@@ -1,7 +1,17 @@
+c++17 lacks std::bind2nd
 citra-qt currently needs SDL for audio and input
 
 --- CMakeLists.txt.orig	2017-08-09 15:54:29 UTC
 +++ CMakeLists.txt
+@@ -89,7 +88,7 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
+ # Configure compilation flags
+ # ===========================
+ 
+-set(CMAKE_CXX_STANDARD 17)
++set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ if (NOT MSVC)
 @@ -207,15 +207,15 @@ if (ENABLE_SDL2)
      else()
          find_package(SDL2 REQUIRED)