 @@ -1,5 +1,8 @@
 fasttracker2 is a Fasttracker II clone in C using SDL 2.
 fasttracker2 is a music tracker (a type of music sequencer software)
 for creating and playing back tracker music.
 This clone is meant for computers with a modern GPU and CPU (about
 or newer recommended).  It's also designed for 60Hz refresh
 rates, so it can act choppy if you're above 60Hz.

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2019/07/30 00:06:50 fox Exp $
+$NetBSD: distinfo,v 1.32 2019/08/02 16:54:10 fox Exp $
 SHA1 (ft2clone-b162-code.zip) = 4616581dac4cd8b498c88cad381dd9910b326390
 RMD160 (ft2clone-b162-code.zip) = a24993258f783e345f812f75a35a703154fb0aec
 SHA512 (ft2clone-b162-code.zip) = 4b85514aece028075e8e5017c3b0c26638f0c74e18ac669788393a03457cb903959a548de9b1ca249eab8e629e18503dd1a7519aa81645a26e8f25684c4ec817
 Size (ft2clone-b162-code.zip) = 3953315 bytes
-SHA1 (patch-src_ft2__diskop.c) = 054e62ba9b512ea0297874988252e7fd0db4e162
+SHA1 (patch-src_ft2__diskop.c) = 6ec7fe7e9bb13b3413cfe053f1609f8ca70c956f
-SHA1 (patch-src_ft2__header.h) = 738181fabffcdcaa5ed7a4b1ae533246b6788bff
+SHA1 (patch-src_ft2__header.h) = a685ab05efdefe712bbe65b0a2b4ed41bc1e4670
-SHA1 (patch-src_ft2__sample__ed.c) = 5cb4bbdb17d6e7cd98d378fe7dac8524630783c0
+SHA1 (patch-src_ft2__sample__ed.c) = b5f38a7df35e64a4c995bd9c1b213b587a0c500a
-SHA1 (patch-src_ft2__unicode.c) = bca10844af2298f77c4f2a8580d030bf2ad54364
+SHA1 (patch-src_ft2__unicode.c) = 1302d414cfdd35441a6cfad918d3663e4c14665b

 @@ -1,20 +1,26 @@
-$NetBSD: patch-src_ft2__diskop.c,v 1.5 2019/07/30 00:06:50 fox Exp $
+$NetBSD: patch-src_ft2__diskop.c,v 1.6 2019/08/02 16:54:10 fox Exp $
 . Added <sys/types.h> / <sys/stat.h> to prevent "unknown type name"
    (dev_t, ino_t and nlink_t) error from the included <fts.h>.
 . Added <sys/types.h> and <sys/stat.h> before the include of
    <fts.h>. While fts(3) is not yet standardized by POSIX, NetBSD
    contains an implementation that was expected to comply with the
    eventual standard, and fts(3) on NetBSD documents that the above
    includes are required. Resolves build failure on netbsd-8.
 . Added SunOS / SmartOS compatibility.
 Note: Contacted the upstream author regarding the patch and awaiting a
 reply. https://16-bits.org/ft2.php
 --- src/ft2_diskop.c.orig	2019-06-20 21:20:34.000000000 +0000
 +++ src/ft2_diskop.c
 @@ -15,6 +15,8 @@
  #include <direct.h>
  #include <shlobj.h> // SHGetFolderPathW()
  #else
 +#include <sys/types.h>
 +#include <sys/stat.h>
  #include <fts.h> // for fts_open() and stuff in recursiveDelete()
  #include <unistd.h>
  #include <dirent.h>
 @@ -1395,6 +1397,10 @@ static int8_t findFirst(DirRec *searchRe
  	int64_t fSize;

 @@ -1,16 +1,25 @@
-$NetBSD: patch-src_ft2__header.h,v 1.2 2019/07/23 08:20:22 fox Exp $
+$NetBSD: patch-src_ft2__header.h,v 1.3 2019/08/02 16:54:10 fox Exp $
 Add the HAS_SSE macro so that build failures do not occur in i386
 systems that lack SSE support.
 For example: On i386, the compiler may be targeting a CPU that does
 not have SSE (e.g., on NetBSD, the i386 target is i486). fasttracker2
 various assembly pieces that use different CPU features. HAS_SSE macro
 needs to be set in systems which has these CPU features and compile
 correctly.
 Note: Contacted the upstream author regarding the patch and awaiting a
 reply. https://16-bits.org/ft2.php
 --- src/ft2_header.h.orig	2019-07-22 16:21:07.522137321 +0000
 +++ src/ft2_header.h
 @@ -77,7 +77,7 @@
  #define float2int32_round(i, f) (i = _mm_cvt_ss2si(_mm_load_ss(&f)))
  #define double2int32_round(i, d) (i = _mm_cvtsd_si32(_mm_load_sd(&d)))
 -#elif defined _WIN32 || defined __i386__ // may have SSE and SSE2
 +#elif defined HAS_SSE && (defined _WIN32 || defined __i386__) // may have SSE and SSE2
  #define float2int32_round(i, f) \
  	if (cpu.hasSSE) \

 @@ -1,18 +1,27 @@
-$NetBSD: patch-src_ft2__sample__ed.c,v 1.2 2019/07/23 08:20:22 fox Exp $
+$NetBSD: patch-src_ft2__sample__ed.c,v 1.3 2019/08/02 16:54:10 fox Exp $
 Add the HAS_SSE macro so that build failures do not occur in i386
 systems that lack SSE support.
 For example: On i386, the compiler may be targeting a CPU that does
 not have SSE (e.g., on NetBSD, the i386 target is i486). fasttracker2
 various assembly pieces that use different CPU features. HAS_SSE macro
 needs to be set in systems which has these CPU features and compile
 correctly.
 Note: Contacted the upstream author regarding the patch and awaiting a
 reply. https://16-bits.org/ft2.php
 --- src/ft2_sample_ed.c.orig	2019-07-22 16:27:23.010951973 +0000
 +++ src/ft2_sample_ed.c
 @@ -689,7 +689,7 @@ static void sampleLine(int16_t x1, int16
  static void getMinMax16(const void *p, uint32_t scanLen, int16_t *min16, int16_t *max16)
+ {
 -#if defined __APPLE__ || defined _WIN32 || defined __i386__ || defined __amd64__
 +#if defined __APPLE__ || (defined HAS_SSE && (defined _WIN32 || defined __i386)) || defined __amd64__
  	if (cpu.hasSSE2)
+ 	{
  		/* Taken with permission from the OpenMPT project (and slightly modified).
 @@ -775,7 +775,7 @@ static void getMinMax16(const void *p, u

 @@ -1,23 +1,26 @@
-$NetBSD: patch-src_ft2__unicode.c,v 1.4 2019/07/30 00:06:50 fox Exp $
+$NetBSD: patch-src_ft2__unicode.c,v 1.5 2019/08/02 16:54:10 fox Exp $
 . Added a type cast to iconv(3) calls to match the prototypes defined
 in NetBSD's iconv.h.
 . Added a NetBSD specific iconv_open() call to prevent failures due
 to mismatches iconv_open() parameters present in GNU iconv(3).
 . Added support for SunOS / SmartOS compatibility.
 Note: Contacted the upstream author regarding the patch and awaiting a
 reply. https://16-bits.org/ft2.php
 --- src/ft2_unicode.c.orig	2019-06-18 19:45:46.000000000 +0000
 +++ src/ft2_unicode.c
 @@ -271,7 +271,11 @@ char *cp437ToUtf8(char *src)
  	inLen = srcLen;
  	outPtr = outBuf;
 +#if defined(__NetBSD__) || defined(__sun) || defined(sun)
 +	rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen);
 +#else
  	rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen);
 +#endif
  	iconv(cd, NULL, NULL, &outPtr, &outLen); // flush
  	iconv_close(cd);