diff options
| author | kamil <kamil@pkgsrc.org> | 2019-10-25 09:56:51 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-10-25 09:56:51 +0000 |
| commit | 09676e1a07a96224b44d621f49592e6b4a92a677 (patch) | |
| tree | 7b10864a01f049a183b9593a7e5960a6d108edd6 /emulators | |
| parent | d78521cfafd37a43fe729153ff8fda346cbff5f1 (diff) | |
| download | pkgsrc-09676e1a07a96224b44d621f49592e6b4a92a677.tar.gz | |
dolphin-emu: Fix build on NetBSD 9.99.17
Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/dolphin-emu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dolphin-emu/patches/patch-Source_Core_Common_StringUtil.cpp | 26 |
2 files changed, 23 insertions, 7 deletions
diff --git a/emulators/dolphin-emu/distinfo b/emulators/dolphin-emu/distinfo index 1c2de07ddf4..e36da6f010b 100644 --- a/emulators/dolphin-emu/distinfo +++ b/emulators/dolphin-emu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2019/01/02 00:30:01 nia Exp $ +$NetBSD: distinfo,v 1.3 2019/10/25 09:56:51 kamil Exp $ SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a @@ -8,7 +8,7 @@ SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6 SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5 SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05 -SHA1 (patch-Source_Core_Common_StringUtil.cpp) = b2b5d5eef849003b460a230d41e51682d98cd67d +SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16 SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3 SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75 SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768 diff --git a/emulators/dolphin-emu/patches/patch-Source_Core_Common_StringUtil.cpp b/emulators/dolphin-emu/patches/patch-Source_Core_Common_StringUtil.cpp index 14f88cb147b..19971c1ac8e 100644 --- a/emulators/dolphin-emu/patches/patch-Source_Core_Common_StringUtil.cpp +++ b/emulators/dolphin-emu/patches/patch-Source_Core_Common_StringUtil.cpp @@ -1,10 +1,26 @@ -$NetBSD: patch-Source_Core_Common_StringUtil.cpp,v 1.1 2019/01/01 17:19:58 nia Exp $ +$NetBSD: patch-Source_Core_Common_StringUtil.cpp,v 1.2 2019/10/25 09:56:51 kamil Exp $ Support NetBSD. --- Source/Core/Common/StringUtil.cpp.orig 2016-06-24 08:09:07.000000000 +0000 +++ Source/Core/Common/StringUtil.cpp -@@ -121,11 +121,11 @@ bool CharArrayFromFormatV(char* out, int +@@ -28,6 +28,15 @@ + #include <errno.h> + #endif + ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#if __NetBSD_Prereq__(9,99,17) ++#define NETBSD_POSIX_ICONV 1 ++#else ++#define NETBSD_POSIX_ICONV 0 ++#endif ++#endif ++ + #if !defined(_WIN32) && !defined(ANDROID) + static locale_t GetCLocale() + { +@@ -121,11 +130,11 @@ bool CharArrayFromFormatV(char* out, int c_locale = _create_locale(LC_ALL, "C"); writtenCount = _vsnprintf_l(out, outsize, format, c_locale, args); #else @@ -18,7 +34,7 @@ Support NetBSD. uselocale(previousLocale); #endif #endif -@@ -162,12 +162,12 @@ std::string StringFromFormatV(const char +@@ -162,12 +171,12 @@ std::string StringFromFormatV(const char std::string temp = buf; delete[] buf; #else @@ -33,11 +49,11 @@ Support NetBSD. uselocale(previousLocale); #endif -@@ -427,8 +427,13 @@ std::string CodeToUTF8(const char* fromc +@@ -427,8 +436,13 @@ std::string CodeToUTF8(const char* fromc while (src_bytes != 0) { -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV + size_t const iconv_result = iconv(conv_desc, (const char**)(&src_buffer), &src_bytes, + &dst_buffer, &dst_bytes); +#else |