Index: branches/2017Q3/emulators/citra/Makefile =================================================================== --- branches/2017Q3/emulators/citra/Makefile (revision 447694) +++ branches/2017Q3/emulators/citra/Makefile (revision 447695) @@ -1,76 +1,77 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20170713 +PORTVERSION= s20170809 PORTREVISION?= 0 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo 3DS emulator/debugger LICENSE= BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ LGPL21+ MIT UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt LICENSE_FILE_MIT= ${WRKSRC}/externals/enet/LICENSE LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch LICENSE_NAME_UNLICENSE= The Unlicense LICENSE_TEXT_UNLICENSE= See http://unlicense.org/ LICENSE_PERMS_UNLICENSE= ${_LICENSE_PERMS_PD} LICENSE_GROUPS_UNLICENSE= ${_LICENSE_GROUPS_PD} BUILD_DEPENDS= boost-libs>=1.63:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png # backend_x64/hostloc.h:93:8: fatal error: no type named 'Reg64' in namespace 'Xbyak' ONLY_FOR_ARCHS= amd64 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 \ herumi:xbyak:v5.40:xbyak/externals/xbyak \ lsalzman:enet:a84c120:enet/externals/enet \ neobrain:nihstro:7e24743:nihstro/externals/nihstro \ 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 USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags USE_SDL= sdl2 FAVORITE_COMPILER= ${COMPILER_TYPE} # c++14-lib CMAKE_ARGS= -DENABLE_WEB_SERVICE=off # XXX unbundle curl-7.52.1 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} SDL_CMAKE_BOOL= ENABLE_SDL2 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,' \ + -e '/check_submodules_present()/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in .include Index: branches/2017Q3/emulators/citra/distinfo =================================================================== --- branches/2017Q3/emulators/citra/distinfo (revision 447694) +++ branches/2017Q3/emulators/citra/distinfo (revision 447695) @@ -1,21 +1,21 @@ -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 SIZE (MerryMage-dynarmic-8f15e3f_GH0.tar.gz) = 420423 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 (lsalzman-enet-a84c120_GH0.tar.gz) = 409d458f2da9d8bba49191ab6abaeb6bcf89193cd5eff07382c1d7b5f3fb06f0 SIZE (lsalzman-enet-a84c120_GH0.tar.gz) = 79369 SHA256 (neobrain-nihstro-7e24743_GH0.tar.gz) = 063728b01f7de99ca91693c46bd5c5a0fb03c0058baf4452d539f630b10f3650 SIZE (neobrain-nihstro-7e24743_GH0.tar.gz) = 110273 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 SIZE (weidai11-cryptopp-CRYPTOPP_5_6_5-164-g841c37e_GH0.tar.gz) = 6912141 Index: branches/2017Q3/emulators/citra/files/patch-src_core_telemetry__session.cpp =================================================================== --- branches/2017Q3/emulators/citra/files/patch-src_core_telemetry__session.cpp (revision 447694) +++ branches/2017Q3/emulators/citra/files/patch-src_core_telemetry__session.cpp (nonexistent) @@ -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(duration).count()}; -+ const s64 start_time{std::chrono::duration_cast(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(duration).count()}; -+ const s64 end_time{std::chrono::duration_cast(duration).count()}; - AddField(Telemetry::FieldType::Session, "EndTime", end_time); - - // Complete the session, submitting to web service if necessary Property changes on: branches/2017Q3/emulators/citra/files/patch-src_core_telemetry__session.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q3/emulators/citra-qt5/Makefile =================================================================== --- branches/2017Q3/emulators/citra-qt5/Makefile (revision 447694) +++ branches/2017Q3/emulators/citra-qt5/Makefile (revision 447695) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../citra OPTIONS_SLAVE= QT5 .include "${MASTERDIR}/Makefile" Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 447694) +++ branches/2017Q3 (revision 447695) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r447638