gemrb: Update to 0.8.7

GemRB v0.8.7 (2020-08-23):
  New features:
    - new smarter pathfinder with bumping support
    - animal taming, iwd2 hardcoded saving throw bonuses
    - vcpkg and out-of-the box msvc support
    - non-ascii data filename support

  Improved features:
    - disk reading speedups, ease of setup
    - iwd chargen, pst spell timing, hardcoded overlays, iwd2 casting ai
    - better actor speeds & walk sounds
    - audio, pst ini handling, savegame compatibility, morale handling
    - effects, projectiles, actions, range calculations
    - bugfixes

  Notes:
    - switched to c++11 and cmake 3.1 as a minimum
    - dropped windows 9x compatibility


(nia)

$NetBSD: patch-gemrb_core_System_Logging.h,v 1.1 2020/08/31 12:46:21 nia Exp $

Include <cstdarg> for va_list

--- gemrb/core/System/Logging.h.orig	2020-08-23 18:32:26.000000000 +0000
+++ gemrb/core/System/Logging.h
@@ -29,6 +29,8 @@
 #include "exports.h"
 #include "win32def.h"
 
+#include <cstdarg>
+
 namespace GemRB {
 
 #ifdef WIN32

$NetBSD: patch-gemrb_core_System_String.cpp,v 1.1 2020/08/31 12:46:21 nia Exp $

Deal with old NetBSD/SunOS style iconv.

--- gemrb/core/System/String.cpp.orig	2020-08-23 18:32:26.000000000 +0000
+++ gemrb/core/System/String.cpp
@@ -35,6 +35,15 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #include <cerrno>
+
+#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 /* __NetBSD_Prereq__(9,99,17) */
+#endif /* defined(__NetBSD__) */
 #endif
 
 namespace GemRB {
@@ -127,7 +136,11 @@ char* ConvertCharEncoding(const char* st
 	size_t out_len_left = out_len;
 	char* buf = (char*) malloc(out_len);
 	char* buf_out = buf;
+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+	size_t ret = iconv(cd, (const char **)&in, &in_len, &buf_out, &out_len_left);
+#else
 	size_t ret = iconv(cd, &in, &in_len, &buf_out, &out_len_left);
+#endif
 	iconv_close(cd);
 
 	if (ret == (size_t)-1) {

$NetBSD: patch-gemrb_plugins_TTFImporter_TTFFont.cpp,v 1.1 2020/08/31 12:46:21 nia Exp $

Deal with old NetBSD/SunOS style iconv.

--- gemrb/plugins/TTFImporter/TTFFont.cpp.orig	2020-08-23 18:32:26.000000000 +0000
+++ gemrb/plugins/TTFImporter/TTFFont.cpp
@@ -28,6 +28,14 @@
 #if HAVE_ICONV
 #include <iconv.h>
 #include <errno.h>
+#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 /* __NetBSD_Prereq__(9,99,17) */
+#endif /* defined(__NetBSD__) */
 #endif
 
 namespace GemRB {
@@ -50,7 +58,11 @@ const Glyph& TTFFont::GetGlyph(ieWord ch
 		// TODO: make this work on BE systems
 		// TODO: maybe we want to work with non-unicode fonts?
 		iconv_t cd = iconv_open("UTF-16LE", core->TLKEncoding.encoding.c_str());
+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+		size_t ret = iconv(cd, (const char **)&oldchar, &in, &newchar, &out);
+#else
 		size_t ret = iconv(cd, &oldchar, &in, &newchar, &out);
+#endif
 
 		if (ret != GEM_OK) {
 			Log(ERROR, "FONT", "iconv error: %d", errno);