Date: Wed, 14 Jun 2017 14:06:35 +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: r443574 - in branches/2017Q2/emulators/citra: . files Message-ID: <201706141406.v5EE6ZbL008427@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jun 14 14:06:35 2017 New Revision: 443574 URL: https://svnweb.freebsd.org/changeset/ports/443574 Log: MFH: r443545 emulators/citra: update to s20170613 Changes: https://github.com/citra-emu/citra/compare/8d558777a...ac168eeb5 Approved by: ports-secteam (feld) Added: branches/2017Q2/emulators/citra/files/patch-src_core_telemetry__session.cpp - copied unchanged from r443545, head/emulators/citra/files/patch-src_core_telemetry__session.cpp Modified: branches/2017Q2/emulators/citra/Makefile branches/2017Q2/emulators/citra/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/emulators/citra/Makefile ============================================================================== --- branches/2017Q2/emulators/citra/Makefile Wed Jun 14 14:05:06 2017 (r443573) +++ branches/2017Q2/emulators/citra/Makefile Wed Jun 14 14:06:35 2017 (r443574) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20170516 +PORTVERSION= s20170613 PORTREVISION?= 0 CATEGORIES= emulators @@ -10,9 +10,9 @@ 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_BSD2CLAUSE=${WRKSRC}/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_BSL= ${WRKSRC}/externals/catch/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_NAME_UNLICENSE= The Unlicense @@ -29,13 +29,13 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dy USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 8d558777a +GH_TAGNAME= ac168eeb5 GH_TUPLE= citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \ - MerryMage:dynarmic:358cf7c:dynarmic/externals/dynarmic \ - fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \ + MerryMage:dynarmic:7707ff1:dynarmic/externals/dynarmic \ + fmtlib:fmt:3.0.0-187-gac5484c:fmt/externals/fmt \ herumi:xbyak:v5.40:xbyak/externals/xbyak \ neobrain:nihstro:7e24743:nihstro/externals/nihstro \ - philsquared:Catch:v1.4.0:catch/externals/catch \ + philsquared:Catch:v1.9.4:catch/externals/catch \ svn2github:inih:603729d:inih/externals/inih/inih \ weidai11:cryptopp:CRYPTOPP_5_6_5-164-g841c37e:cryptopp/externals/cryptopp/cryptopp Modified: branches/2017Q2/emulators/citra/distinfo ============================================================================== --- branches/2017Q2/emulators/citra/distinfo Wed Jun 14 14:05:06 2017 (r443573) +++ branches/2017Q2/emulators/citra/distinfo Wed Jun 14 14:06:35 2017 (r443574) @@ -1,18 +1,18 @@ -TIMESTAMP = 1494954037 -SHA256 (citra-emu-citra-s20170516-8d558777a_GH0.tar.gz) = df9acb5e112f7ee9b937e4f94a957f3977b0356eedee48c40c5b0f63097f689a -SIZE (citra-emu-citra-s20170516-8d558777a_GH0.tar.gz) = 2233499 +TIMESTAMP = 1497380458 +SHA256 (citra-emu-citra-s20170613-ac168eeb5_GH0.tar.gz) = 0289a85717e893c23e7deed9a1d60336b4560922dca5fa53c5f0b5cc01be0091 +SIZE (citra-emu-citra-s20170613-ac168eeb5_GH0.tar.gz) = 2261570 SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535 -SHA256 (MerryMage-dynarmic-358cf7c_GH0.tar.gz) = ba3efc77df14473e20fc1bead08725d0d5a67ff71726cf749e6d3970f7e7ca03 -SIZE (MerryMage-dynarmic-358cf7c_GH0.tar.gz) = 321864 -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 (MerryMage-dynarmic-7707ff1_GH0.tar.gz) = 3f3a2158b0ee5550ad1c7edfc1144a3d7936a7130f3d36a8e71f9fd95996bd55 +SIZE (MerryMage-dynarmic-7707ff1_GH0.tar.gz) = 420317 +SHA256 (fmtlib-fmt-3.0.0-187-gac5484c_GH0.tar.gz) = 1400d4e807c5bb0329e44784210bbabddd4f42103f3d9d86c8d3d97188bc9975 +SIZE (fmtlib-fmt-3.0.0-187-gac5484c_GH0.tar.gz) = 615682 SHA256 (herumi-xbyak-v5.40_GH0.tar.gz) = 106bbe15dc7e5d025ff98d1b5dd62a3f0a26d2569debe77fcde14852d50a66e1 SIZE (herumi-xbyak-v5.40_GH0.tar.gz) = 203521 SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650 SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273 -SHA256 (philsquared-Catch-v1.4.0_GH0.tar.gz) = b225e9828291636745db75e42cd604b8d755dcad0c5235fc90d7c725c4b49fb1 -SIZE (philsquared-Catch-v1.4.0_GH0.tar.gz) = 311263 +SHA256 (philsquared-Catch-v1.9.4_GH0.tar.gz) = d67d2ee26ec9f72618dd9b28a9d1b7ba3c6368bc846ecfeda05a1e5d1b8b9b20 +SIZE (philsquared-Catch-v1.9.4_GH0.tar.gz) = 363097 SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342 SHA256 (weidai11-cryptopp-CRYPTOPP_5_6_5-164-g841c37e_GH0.tar.gz) = 70ea37578cc7eebcfa4c621c7f61c2a255c895156064eba1c33053b1d01a95ee Copied: branches/2017Q2/emulators/citra/files/patch-src_core_telemetry__session.cpp (from r443545, head/emulators/citra/files/patch-src_core_telemetry__session.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q2/emulators/citra/files/patch-src_core_telemetry__session.cpp Wed Jun 14 14:06:35 2017 (r443574, copy of r443545, head/emulators/citra/files/patch-src_core_telemetry__session.cpp) @@ -0,0 +1,22 @@ +https://github.com/citra-emu/citra/issues/2775 + +--- src/core/telemetry_session.cpp.orig 2017-06-09 04:16:46 UTC ++++ src/core/telemetry_session.cpp +@@ -15,7 +15,7 @@ TelemetrySession::TelemetrySession() { + + // Log one-time session start information + const auto duration{std::chrono::steady_clock::now().time_since_epoch()}; +- const auto start_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()}; ++ const s64 start_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()}; + AddField(Telemetry::FieldType::Session, "StartTime", start_time); + + // Log one-time application information +@@ -28,7 +28,7 @@ TelemetrySession::TelemetrySession() { + TelemetrySession::~TelemetrySession() { + // Log one-time session end information + const auto duration{std::chrono::steady_clock::now().time_since_epoch()}; +- const auto end_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()}; ++ const s64 end_time{std::chrono::duration_cast<std::chrono::microseconds>(duration).count()}; + AddField(Telemetry::FieldType::Session, "EndTime", end_time); + + // Complete the session, submitting to web service if necessary
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706141406.v5EE6ZbL008427>