Index: branches/2018Q2/emulators/citra/Makefile =================================================================== --- branches/2018Q2/emulators/citra/Makefile (revision 468151) +++ branches/2018Q2/emulators/citra/Makefile (revision 468152) @@ -1,75 +1,75 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180418 +PORTVERSION= s20180422 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 BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs # 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= 394638e9 +GH_TAGNAME= 7d8b7d93 GH_TUPLE= citra-emu:ext-libressl-portable:cbb1dca:libressl/externals/libressl \ 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-510-g5859e58: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_1_0:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags USE_SDL= sdl2 EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${OSREL:R}} EXTRA_PATCHES_FreeBSD_10= ${PATCHDIR}/extra-patch-c++14 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} \ bin/${PORTNAME}-room \ man/man6/${PORTNAME}.6.gz QT5_USES= desktop-file-utils shared-mime-info QT5_USE= QT5=qmake_build,buildtools_build,concurrent_build,core,gui,opengl,widgets QT5_CMAKE_BOOL= ENABLE_QT QT5_PLIST_FILES=bin/${PORTNAME}-qt \ "@comment bin/${PORTNAME}-room" \ man/man6/${PORTNAME}-qt.6.gz \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/mime/packages/${PORTNAME}.xml 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/2018Q2/emulators/citra/distinfo =================================================================== --- branches/2018Q2/emulators/citra/distinfo (revision 468151) +++ branches/2018Q2/emulators/citra/distinfo (revision 468152) @@ -1,23 +1,23 @@ -TIMESTAMP = 1524042625 -SHA256 (citra-emu-citra-s20180418-394638e9_GH0.tar.gz) = 4ebbbeab6a2005099bdb3626d5d956a4085330370c535a4151383bc8d5237a6c -SIZE (citra-emu-citra-s20180418-394638e9_GH0.tar.gz) = 1904056 +TIMESTAMP = 1524161017 +SHA256 (citra-emu-citra-s20180422-7d8b7d93_GH0.tar.gz) = e7a7a344d5075deaeb03885d74edd4a45dd534e0656e26b1b49ce3e5c691713b +SIZE (citra-emu-citra-s20180422-7d8b7d93_GH0.tar.gz) = 1921221 SHA256 (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = f3741a3bb480d9f8a817f032f59d1908e659620cbb93c0fe8289cfb46d2ab89c SIZE (citra-emu-ext-libressl-portable-cbb1dca_GH0.tar.gz) = 1761962 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 SIZE (MerryMage-dynarmic-d1d4705_GH0.tar.gz) = 1248870 SHA256 (benhoyt-inih-r40_GH0.tar.gz) = 0a7d8600c523ccd2d01a5bec2ef3a6482ada49794e67cf694d2bec796cb2c340 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-510-g5859e58_GH0.tar.gz) = 6d719fe37c54ffcd6a7c1679a288e4947304cc24b4ff00aaf679ef0b0474a7b3 SIZE (fmtlib-fmt-4.0.0-510-g5859e58_GH0.tar.gz) = 623334 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_1_0_GH0.tar.gz) = 69ee71fdff9cc0d56634712703c8eba97204bf58feacdfe1a94df87faffeff55 SIZE (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 7195344 Index: branches/2018Q2/emulators/citra/files/extra-patch-c++14 =================================================================== --- branches/2018Q2/emulators/citra/files/extra-patch-c++14 (revision 468151) +++ branches/2018Q2/emulators/citra/files/extra-patch-c++14 (revision 468152) @@ -1,58 +1,86 @@ libc++ on FreeBSD 10.* doesn't support c++17 yet In file included from src/core/core_timing.cpp:12: In file included from /usr/include/c++/v1/unordered_map:350: /usr/include/c++/v1/__hash_table:1165:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table() ^ /usr/include/c++/v1/__hash_table:852:5: note: previous declaration is here __hash_table() ^ /usr/include/c++/v1/__hash_table:1233:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>' __hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u) ^ /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, std::__1::allocator >::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, std::__1::allocator >::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); ^ +/usr/bin/ld.lld: error: undefined symbol: StatusMessage::system_color +>>> referenced by src/citra_qt/multiplayer/chat_room.cpp +>>> src/citra_qt/CMakeFiles/citra-qt.dir/multiplayer/chat_room.cpp.o:(StatusMessage::GetSystemChatMessage() const) + +/usr/bin/ld.lld: error: undefined symbol: ChatMessage::player_color +>>> referenced by src/citra_qt/multiplayer/chat_room.cpp +>>> src/citra_qt/CMakeFiles/citra-qt.dir/multiplayer/chat_room.cpp.o:(ChatMessage::GetPlayerChatMessage(unsigned short) const) + --- CMakeLists.txt.orig 2018-02-14 15:32:26 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) +--- src/citra_qt/multiplayer/chat_room.cpp.orig 2018-04-19 18:03:37 UTC ++++ src/citra_qt/multiplayer/chat_room.cpp +@@ -36,7 +36,7 @@ class ChatMessage { (public) + } + + private: +- static constexpr std::array player_color = { ++ static inline constexpr std::array player_color = { + {"#0000FF", "#FF0000", "#8A2BE2", "#FF69B4", "#1E90FF", "#008000", "#00FF7F", "#B22222", + "#DAA520", "#FF4500", "#2E8B57", "#5F9EA0", "#D2691E", "#9ACD32", "#FF7F50", "FFFF00"}}; + +@@ -60,7 +60,7 @@ class StatusMessage { (public) + } + + private: +- static constexpr const char system_color[] = "#888888"; ++ static inline constexpr const char system_color[] = "#888888"; + QString timestamp; + QString message; + }; --- 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& 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(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(u16str.data()), data.data(), u16str.size() * sizeof(char16_t)); break; } Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 468151) +++ branches/2018Q2 (revision 468152) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r468037