Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Mar 2018 01:02:04 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r463682 - in branches/2018Q1/emulators/citra: . files
Message-ID:  <201803060102.w26125pF020247@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Mar  6 01:02:04 2018
New Revision: 463682
URL: https://svnweb.freebsd.org/changeset/ports/463682

Log:
  MFH: r463465 r463677
  
  emulators/citra: update to s20180302
  
  Changes:	https://github.com/citra-emu/citra/compare/ac626eda...7c1a2235
  Approved by:	ports-secteam (swills, implicit for snapshots)

Deleted:
  branches/2018Q1/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h
Modified:
  branches/2018Q1/emulators/citra/Makefile
  branches/2018Q1/emulators/citra/distinfo
  branches/2018Q1/emulators/citra/files/extra-patch-c++14
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/emulators/citra/Makefile
==============================================================================
--- branches/2018Q1/emulators/citra/Makefile	Tue Mar  6 01:01:05 2018	(r463681)
+++ branches/2018Q1/emulators/citra/Makefile	Tue Mar  6 01:02:04 2018	(r463682)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	citra
-PORTVERSION=	s20180228
+PORTVERSION=	s20180302
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -26,16 +26,16 @@ ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dy
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	ac626eda
+GH_TAGNAME=	7c1a2235
 GH_TUPLE=	citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:d1d4705:dynarmic/externals/dynarmic \
 		benhoyt:inih:r40:inih/externals/inih/inih \
 		catchorg:Catch2:v2.1.1:catch/externals/catch \
-		fmtlib:fmt:4.0.0:fmt/externals/fmt \
+		fmtlib:fmt:4.0.0-435-g4d35f94:fmt/externals/fmt \
 		herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \
 		lsalzman:enet:39a72ab:enet/externals/enet \
 		neobrain:nihstro:fd69de1:nihstro/externals/nihstro \
-		weidai11:cryptopp:CRYPTOPP_6_0_0:cryptopp/externals/cryptopp/cryptopp
+		weidai11:cryptopp:CRYPTOPP_6_1_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	Tue Mar  6 01:01:05 2018	(r463681)
+++ branches/2018Q1/emulators/citra/distinfo	Tue Mar  6 01:02:04 2018	(r463682)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1519827933
-SHA256 (citra-emu-citra-s20180228-ac626eda_GH0.tar.gz) = ea5aaa73a5eca109698c710efb7ae4cbbae2824c76d9f15ecc12ac79cbaa1a36
-SIZE (citra-emu-citra-s20180228-ac626eda_GH0.tar.gz) = 1677326
+TIMESTAMP = 1520024323
+SHA256 (citra-emu-citra-s20180302-7c1a2235_GH0.tar.gz) = a4241e5acb813e33338a51c755bf5a4036bb23b07ecde3d55352a342f14c13fb
+SIZE (citra-emu-citra-s20180302-7c1a2235_GH0.tar.gz) = 1677731
 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
@@ -9,15 +9,15 @@ SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd
 SIZE (benhoyt-inih-r40_GH0.tar.gz) = 11436
 SHA256 (catchorg-Catch2-v2.1.1_GH0.tar.gz) = c40d3c8133c9274946067007e911a55b0d0ad3ed7c59a1f258dfcdb6836d8eff
 SIZE (catchorg-Catch2-v2.1.1_GH0.tar.gz) = 481236
-SHA256 (fmtlib-fmt-4.0.0_GH0.tar.gz) = 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a
-SIZE (fmtlib-fmt-4.0.0_GH0.tar.gz) = 617818
+SHA256 (fmtlib-fmt-4.0.0-435-g4d35f94_GH0.tar.gz) = fb8f361a8b33cdca1bb5ca1b9124e35133c4f7469343f6d54f65cb3f2d5b7caf
+SIZE (fmtlib-fmt-4.0.0-435-g4d35f94_GH0.tar.gz) = 621671
 SHA256 (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 51129bc945fe2650f5fcd41f3b0166555b17589f03bda5d2216927234ef6446a
 SIZE (herumi-xbyak-v5.53-1-gc5da377_GH0.tar.gz) = 206888
 SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411dc681caba6887a7e3f152009e6be1
 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_6_0_0_GH0.tar.gz) = ed951973ae4f4d52edcf25882fa5238145a00adc81edb9d7be4ce7b9aa744269
-SIZE (weidai11-cryptopp-CRYPTOPP_6_0_0_GH0.tar.gz) = 7158162
+SHA256 (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 69ee71fdff9cc0d56634712703c8eba97204bf58feacdfe1a94df87faffeff55
+SIZE (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 7195344
 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/extra-patch-c++14
==============================================================================
--- branches/2018Q1/emulators/citra/files/extra-patch-c++14	Tue Mar  6 01:01:05 2018	(r463681)
+++ branches/2018Q1/emulators/citra/files/extra-patch-c++14	Tue Mar  6 01:02:04 2018	(r463682)
@@ -14,6 +14,18 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table
 /usr/include/c++/v1/__hash_table:866:5: note: previous declaration is here
     __hash_table(__hash_table&& __u)
     ^
+src/core/file_sys/archive_backend.cpp:24:21: error: cannot initialize a parameter of type 'void *' with an rvalue of type 'const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::value_type *' (aka 'const char *')
+        std::memcpy(string.data(), data.data(), string.size());
+                    ^~~~~~~~~~~~~
+/usr/include/string.h:62:31: note: passing argument to parameter here
+void    *memcpy(void * __restrict, const void * __restrict, size_t);
+                                 ^
+src/core/file_sys/archive_backend.cpp:30:21: error: cannot initialize a parameter of type 'void *' with an rvalue of type 'const std::__1::basic_string<char16_t, std::__1::char_traits<char16_t>, std::__1::allocator<char16_t> >::value_type *' (aka 'const char16_t *')
+        std::memcpy(u16str.data(), data.data(), u16str.size() * sizeof(char16_t));
+                    ^~~~~~~~~~~~~
+/usr/include/string.h:62:31: note: passing argument to parameter here
+void    *memcpy(void * __restrict, const void * __restrict, size_t);
+                                 ^
 
 --- CMakeLists.txt.orig	2018-02-14 15:32:26 UTC
 +++ CMakeLists.txt
@@ -26,3 +38,21 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  
  if (NOT MSVC)
+--- src/core/file_sys/archive_backend.cpp.orig	2018-03-02 20:58:43 UTC
++++ src/core/file_sys/archive_backend.cpp
+@@ -21,13 +21,13 @@ Path::Path(LowPathType type, const std::vector<u8>& da
+ 
+     case LowPathType::Char: {
+         string.resize(data.size() - 1); // Data is always null-terminated.
+-        std::memcpy(string.data(), data.data(), string.size());
++        std::memcpy(const_cast<char *>(string.data()), data.data(), string.size());
+         break;
+     }
+ 
+     case LowPathType::Wchar: {
+         u16str.resize(data.size() / 2 - 1); // Data is always null-terminated.
+-        std::memcpy(u16str.data(), data.data(), u16str.size() * sizeof(char16_t));
++        std::memcpy(const_cast<char16_t *>(u16str.data()), data.data(), u16str.size() * sizeof(char16_t));
+         break;
+     }
+ 



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