cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r468037

Browse Source 
emulators/citra: update to s20180422

Changes:	048b0fc0...7d8b7d93
Approved by:	ports-secteam (swills, implicit for snapshots)
This commit is contained in:
Jan Beich 2018-04-24 00:08:37 +00:00
parent 6a72162e9d
commit 460e985887
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=468152
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emulators/citra/Makefile
View File

@ -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 \

6
emulators/citra/distinfo
View File

@ -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

28
emulators/citra/files/extra-patch-c++14
View File

@ -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