fasttracker2: update to b160

Changes since b159

Beta #160 - 19.06.2019
- Bugfix: Certain instrument properties could be modified even if the current
  instrument was zero. This is a special ins. number for pattern editing, it's
  not a real instrument. (You can set ins. #0 by pressing 0 on the numpad).
- Bugfix: It was impossible to select an instrument higher than 0x60 (100) when
  using the numpad keys.
- Bugfix: "Srnk." (shrink pattern) would erase the last row after its operation
- Bugfix: When loading a floating point .wav, it would only load silence unless
  the amplitude peaked at max (1.0).
- Bugfix: 16-bit mono .aiff files would not load correctly at all!
- When loading 24-bit .wav/.aiff files, properly normalize amplitude before
  converting to 16-bit. This now takes up more CPU time and RAM, but it's worth
  it.
- Default instrument envelopes were always read from preset slot #1. I don't
  like this at all, as it could mess things up when loading sample-only songs.
  It has now been changed to always use the stock envelope values when loading
  such files or when a new project is started (or instruments zapped).
- Properly reject .it (Impulse Tracker) modules when attempted to be loaded
- Code cleanup. Proper space alignment for special tab indents, removed
  extreme use of parenthesis, spaces etc.

4 files changed, 20 insertions, 20 deletions

diff --git a/audio/fasttracker2/Makefile b/audio/fasttracker2/Makefile
index 23046cb1f09..cfaaa7ef355 100644
--- a/audio/fasttracker2/Makefile
+++ b/audio/fasttracker2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2019/06/16 22:01:05 fox Exp $
+# $NetBSD: Makefile,v 1.27 2019/06/20 11:39:06 fox Exp $
 
 DISTNAME=	ft2clone-${DISTVERSION}-code
 PKGNAME=	fasttracker2-${DISTVERSION:C/b/2./}
-DISTVERSION=	b159
+DISTVERSION=	b160
 CATEGORIES=	audio
 MASTER_SITES=	https://16-bits.org/ \
 		${MASTER_SITE_FREEBSD_LOCAL:=ehaupt/}
diff --git a/audio/fasttracker2/distinfo b/audio/fasttracker2/distinfo
index 6c63b3353e4..2fb68929c03 100644
--- a/audio/fasttracker2/distinfo
+++ b/audio/fasttracker2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2019/06/16 22:01:05 fox Exp $
+$NetBSD: distinfo,v 1.26 2019/06/20 11:39:06 fox Exp $
 
-SHA1 (ft2clone-b159-code.zip) = 737a9129db81858e6d09e6b8bf0006f6c932dcdd
-RMD160 (ft2clone-b159-code.zip) = 25a199b9addb47d7d4796133fa1c3d8cbc958c8e
-SHA512 (ft2clone-b159-code.zip) = 3a53ac32a15742eb1d4bacf0c1906cbf96c81e7f13d9bcdd5e6907fb1d393c46353afd7da651148f3e54da866737ad5b5e95cb3edd63579eee3d6a7aedece3af
-Size (ft2clone-b159-code.zip) = 3957477 bytes
-SHA1 (patch-src_ft2__diskop.c) = 9d19b3d4b0a32f61ecbcdda1f9b44e2532a98d41
-SHA1 (patch-src_ft2__unicode.c) = 7e61ebb563bb5edb592182461173d066493791e7
+SHA1 (ft2clone-b160-code.zip) = 4d98b6c27fd730961385dc0a98dbacd0096538ba
+RMD160 (ft2clone-b160-code.zip) = 304076cf25d6e97b045f186a7211119fe1d0c894
+SHA512 (ft2clone-b160-code.zip) = cd74a115e0907a3b96d8cfb7e7e7ea47a5f11b032f5ab4a6c070483facb60a46ab994b9682cc37dc45ce13bcd81f2085089232a4d0368ac6a5b763369b791efa
+Size (ft2clone-b160-code.zip) = 3954825 bytes
+SHA1 (patch-src_ft2__diskop.c) = 0ade49429ec36d44b6cb6bc3b829317fcd08df81
+SHA1 (patch-src_ft2__unicode.c) = 3dca4d5b2de1a2794bde7060d2f7bf6f4923c91c
diff --git a/audio/fasttracker2/patches/patch-src_ft2__diskop.c b/audio/fasttracker2/patches/patch-src_ft2__diskop.c
index f92550865b0..a942018644f 100644
--- a/audio/fasttracker2/patches/patch-src_ft2__diskop.c
+++ b/audio/fasttracker2/patches/patch-src_ft2__diskop.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_ft2__diskop.c,v 1.3 2019/04/19 02:05:14 fox Exp $
+$NetBSD: patch-src_ft2__diskop.c,v 1.4 2019/06/20 11:39:06 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>.
 
 --- src/ft2_diskop.c.orig	2019-04-19 01:53:39.359713817 +0000
 +++ src/ft2_diskop.c
-@@ -13,6 +13,8 @@
+@@ -15,6 +15,8 @@
  #include <direct.h>
  #include <shlobj.h> // SHGetFolderPathW()
  #else
diff --git a/audio/fasttracker2/patches/patch-src_ft2__unicode.c b/audio/fasttracker2/patches/patch-src_ft2__unicode.c
index 21ca858105e..2e0645abcbb 100644
--- a/audio/fasttracker2/patches/patch-src_ft2__unicode.c
+++ b/audio/fasttracker2/patches/patch-src_ft2__unicode.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_ft2__unicode.c,v 1.2 2019/03/21 10:16:40 fox Exp $
+$NetBSD: patch-src_ft2__unicode.c,v 1.3 2019/06/20 11:39:06 fox Exp $
 
 1. Added a type cast to iconv(3) calls to match the prototypes defined
 in NetBSD's iconv.h.
@@ -6,10 +6,10 @@ in NetBSD's iconv.h.
 2. Added a NetBSD specific iconv_open() call to prevent failures due
 to mismatches iconv_open() parameters present in GNU iconv(3).
 
---- src/ft2_unicode.c.orig	2019-03-16 22:34:24.000000000 +0000
+--- src/ft2_unicode.c.orig	2019-06-18 19:45:46.000000000 +0000
 +++ src/ft2_unicode.c
-@@ -277,7 +277,11 @@ char *cp437ToUtf8(char *src)
- 	inLen  = srcLen;
+@@ -271,7 +271,11 @@ char *cp437ToUtf8(char *src)
+ 	inLen = srcLen;
  	outPtr = outBuf;
  
 +#if defined(__NetBSD__)
@@ -20,24 +20,24 @@ to mismatches iconv_open() parameters present in GNU iconv(3).
  	iconv(cd, NULL, NULL, &outPtr, &outLen); // flush
  	iconv_close(cd);
  
-@@ -307,6 +311,8 @@ char *utf8ToCp437(char *src, bool remove
+@@ -301,6 +305,8 @@ char *utf8ToCp437(char *src, bool remove
  
  #ifdef __APPLE__
  	cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8-MAC");
 +#elif defined(__NetBSD__)
-+	cd = iconv_open("437", "UTF-8");    	
++	cd = iconv_open("437", "UTF-8");
  #else
  	cd = iconv_open("437//TRANSLIT//IGNORE", "UTF-8");
  #endif
-@@ -323,7 +329,11 @@ char *utf8ToCp437(char *src, bool remove
- 	inLen  = srcLen;
+@@ -317,7 +323,11 @@ char *utf8ToCp437(char *src, bool remove
+ 	inLen = srcLen;
  	outPtr = outBuf;
  
 +#if defined(__NetBSD__)
 +	rc = iconv(cd, (const char **)&inPtr, &inLen, &outPtr, &outLen);
 +#else
  	rc = iconv(cd, &inPtr, &inLen, &outPtr, &outLen);
-+#endif	
++#endif
  	iconv(cd, NULL, NULL, &outPtr, &outLen); // flush
  	iconv_close(cd);