diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-04-22 16:39:00 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-04-22 16:39:00 +0000 |
| commit | 027d6e93aa1f4ce8655b2ea3acdd74655cd476bd (patch) | |
| tree | f9707119382966c3df775cbf79c4ddfa2cd8261a /emulators | |
| parent | c852d356fb9bf0ff3b16b7ce72472122eaf3a317 (diff) | |
| download | freebsd-ports-027d6e93aa1f4ce8655b2ea3acdd74655cd476bd.zip | |
emulators/citra: update to s20180422
Changes: https://github.com/citra-emu/citra/compare/048b0fc0...7d8b7d93
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/citra/Makefile | 4 | ||||
| -rw-r--r-- | emulators/citra/distinfo | 6 | ||||
| -rw-r--r-- | emulators/citra/files/extra-patch-c++14 | 28 |
3 files changed, 33 insertions, 5 deletions
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 9c2687174f76..519a4c96444c 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20180418 +PORTVERSION= s20180422 PORTREVISION?= 0 CATEGORIES= emulators @@ -25,7 +25,7 @@ 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 \ diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 8d8df7a98480..158c97be19fe 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -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 diff --git a/emulators/citra/files/extra-patch-c++14 b/emulators/citra/files/extra-patch-c++14 index b278c6fbec3c..0c301e58d30d 100644 --- a/emulators/citra/files/extra-patch-c++14 +++ b/emulators/citra/files/extra-patch-c++14 @@ -27,6 +27,14 @@ src/core/file_sys/archive_backend.cpp:30:21: error: cannot initialize a paramete 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}") @@ -38,6 +46,26 @@ void *memcpy(void * __restrict, const void * __restrict, size_t); 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<const char*, 16> player_color = { ++ static inline constexpr std::array<const char*, 16> 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<u8>& da |