aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2017-08-10 02:41:26 +0800
committerjbeich <jbeich@FreeBSD.org>2017-08-10 02:41:26 +0800
commit1c2223df70f8a112f5eab5c268ca1c2c0733036f (patch)
treeb65782ef4750a898c4131c6c1a64fb8353cb5acd /emulators
parentb4caac4ee7f997ae4149a26e21331e385e207bd6 (diff)
downloadfreebsd-ports-gnome-1c2223df70f8a112f5eab5c268ca1c2c0733036f.tar.gz
freebsd-ports-gnome-1c2223df70f8a112f5eab5c268ca1c2c0733036f.tar.zst
freebsd-ports-gnome-1c2223df70f8a112f5eab5c268ca1c2c0733036f.zip
emulators/citra: update to s20170804
Changes: https://github.com/citra-emu/citra/compare/5137a198f...792dee47a MFH: 2017Q3
Diffstat (limited to 'emulators')
-rw-r--r--emulators/citra-qt5/Makefile2
-rw-r--r--emulators/citra/Makefile5
-rw-r--r--emulators/citra/distinfo6
-rw-r--r--emulators/citra/files/patch-src_core_telemetry__session.cpp22
4 files changed, 7 insertions, 28 deletions
diff --git a/emulators/citra-qt5/Makefile b/emulators/citra-qt5/Makefile
index ac7516fe5ba0..690002e635c2 100644
--- a/emulators/citra-qt5/Makefile
+++ b/emulators/citra-qt5/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -qt5
MASTERDIR= ${.CURDIR}/../citra
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index d8a79bc97647..c309ea864488 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= citra
-PORTVERSION= s20170713
+PORTVERSION= s20170809
PORTREVISION?= 0
CATEGORIES= emulators
@@ -26,7 +26,7 @@ ONLY_FOR_ARCHS_REASON= https://github.com/MerryMage/dynarmic/issues/35
USE_GITHUB= yes
GH_ACCOUNT= citra-emu
-GH_TAGNAME= 5137a198f
+GH_TAGNAME= 792dee47a
GH_TUPLE= citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \
MerryMage:dynarmic:8f15e3f:dynarmic/externals/dynarmic \
fmtlib:fmt:3.0.0-187-gac5484c:fmt/externals/fmt \
@@ -63,6 +63,7 @@ QT5_PLIST_FILES=bin/${PORTNAME}-qt \
post-patch:
@${REINPLACE_CMD} -e 's,share/man,man,' \
+ -e '/check_submodules_present()/d' \
${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo
index 71ba95a7e889..1e3d55098392 100644
--- a/emulators/citra/distinfo
+++ b/emulators/citra/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1499929055
-SHA256 (citra-emu-citra-s20170713-5137a198f_GH0.tar.gz) = 662f7a75b3588167f660da89a8ce0e281813a12f60c83da75152b649db7d784f
-SIZE (citra-emu-citra-s20170713-5137a198f_GH0.tar.gz) = 2274381
+TIMESTAMP = 1502294069
+SHA256 (citra-emu-citra-s20170809-792dee47a_GH0.tar.gz) = a404c2a9412ccf9bc9ac417154feab56bcf20fd7696499a026bb8b1c9be4379c
+SIZE (citra-emu-citra-s20170809-792dee47a_GH0.tar.gz) = 2449403
SHA256 (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = de5e101818ba38b5ea30d8cde0b2b788b53bc7c0f5d77b380b8968569872c2cb
SIZE (citra-emu-ext-soundtouch-5274ec4_GH0.tar.gz) = 34535
SHA256 (MerryMage-dynarmic-8f15e3f_GH0.tar.gz) = 3e5b184c8d190849374fa426ee6a511f3375682232b46aaa8e060632eaa4cadb
diff --git a/emulators/citra/files/patch-src_core_telemetry__session.cpp b/emulators/citra/files/patch-src_core_telemetry__session.cpp
deleted file mode 100644
index 78ff387c3b6d..000000000000
--- a/emulators/citra/files/patch-src_core_telemetry__session.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-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