Updated audio/sptk 3.6 to 3.9

-----------------------------
Version 3.9:
 * support full covariance for 'gmmp' command.
 * add -B, -c1 and -c2 option to 'gmmp' command to specify block size and structure of covariance matrix.
 * change temporary file path for csh.
 * bug fixes.

Version 3.8:
 * add 'c2ndps' command for transform from cepstrum to negative derivative of phrase spectrum.
 * add 'mgclsp2sp' command for transform from LSP to spectrum.
 * add 'ndps2c' command for transform from negative derivative of phrase spectrum to cepstrum.
 * add 'wavjoin' command to save stereo wav file.
 * add 'wavsplit' command to load stereo wav file.
 * add -V option to 'dtw' command for loading DTW results.
 * add -e option to calculate inverse matrix stably for 'delta' and 'vc' commands.
 * support MAP estimation in 'gmm' command.
 * replace -i option to -q option for 'lsp2lpc,' 'lspcheck,' and 'mgclsp2mgc' commands.
 * change -c option of 'mlsacheck' command.
 * update swipe and hts_engine API.
 * bug fixes.

Version 3.7:
 * add 'vc' command to perform GMM-based voice conversion.
 * add 'lsp2sp' command to transform LSP coefficients to spectrum.
 * add -R option to 'mlsacheck' command to specify threshold value.
 * add -f option to 'gmmp' command to specify full covariance matrix.
 * add -M, -c1 and -c2 option to 'gmm' command to specify block size and structure of covariance matrix.
 * add -n option to 'delta' command to specify order of regression polynomial.
 * add -magic and -MAGIC option to 'rmse' command to delete and substitute magic number.
 * add -n and -t option to 'rmse' command to specify order and number of vector, respectively.
 * add -POWX, -LOGX option, and new constant (semitone) to 'sopr' command.
 * add -l option to 'decimate' and 'interpolate' command to specify length of vector.
 * add -g and -G option to 'lspcheck' command to check value of gain.
 * add -L option to 'lspcheck' command to specify log gain.
 * add -n option to 'mgc2mgclsp' command to specify split number of unit circle.
 * add -p and -d to 'mgc2mgclsp' command to specify maximum number and end condition of interpolation.
 * add -x 16, 22, 24 and 48 option of 'glogsp' and 'grlogsp' command to specify more x-axis scales.
 * add filter coefficients for 7:4 down-sampling, 3:5 and 7:8 up-sampling.
 * unify option to specify log gain into -L option.
 * fix -c option of 'mlsacheck' command to specify the type of modification of filter coefficients.
 * bug fixes.

5 files changed, 57 insertions, 33 deletions

diff --git a/audio/sptk/Makefile b/audio/sptk/Makefile
index d4a1c9ea954..6cd97ac9201 100644
--- a/audio/sptk/Makefile
+++ b/audio/sptk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2013/10/07 13:06:04 obache Exp $
+# $NetBSD: Makefile,v 1.7 2016/07/10 12:06:21 mef Exp $
 #
 
-DISTNAME=	SPTK-3.6
+DISTNAME=	SPTK-3.9
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sp-tk/}
diff --git a/audio/sptk/PLIST b/audio/sptk/PLIST
index 53304f59210..69f120653e8 100644
--- a/audio/sptk/PLIST
+++ b/audio/sptk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/10/07 13:06:04 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/07/10 12:06:21 mef Exp $
 SPTK/bin/acep
 SPTK/bin/acorr
 SPTK/bin/agcep
@@ -8,9 +8,9 @@ SPTK/bin/b2mc
 SPTK/bin/bcp
 SPTK/bin/bcut
 SPTK/bin/bell
-SPTK/bin/bell.sh
 SPTK/bin/c2acr
 SPTK/bin/c2ir
+SPTK/bin/c2ndps
 SPTK/bin/c2sp
 SPTK/bin/cat2
 SPTK/bin/cdist
@@ -40,18 +40,14 @@ SPTK/bin/freqt
 SPTK/bin/gc2gc
 SPTK/bin/gcep
 SPTK/bin/glogsp
-SPTK/bin/glogsp.sh
 SPTK/bin/glsadf
 SPTK/bin/gmm
 SPTK/bin/gmmp
 SPTK/bin/gnorm
 SPTK/bin/grlogsp
-SPTK/bin/grlogsp.sh
 SPTK/bin/grpdelay
 SPTK/bin/gseries
-SPTK/bin/gseries.sh
 SPTK/bin/gwave
-SPTK/bin/gwave.sh
 SPTK/bin/histogram
 SPTK/bin/idct
 SPTK/bin/ifft
@@ -71,6 +67,7 @@ SPTK/bin/lpc2c
 SPTK/bin/lpc2lsp
 SPTK/bin/lpc2par
 SPTK/bin/lsp2lpc
+SPTK/bin/lsp2sp
 SPTK/bin/lspcheck
 SPTK/bin/lspdf
 SPTK/bin/ltcdf
@@ -80,11 +77,10 @@ SPTK/bin/merge
 SPTK/bin/mfcc
 SPTK/bin/mgc2mgc
 SPTK/bin/mgc2mgclsp
-SPTK/bin/mgc2mgclsp.sh
 SPTK/bin/mgc2sp
 SPTK/bin/mgcep
 SPTK/bin/mgclsp2mgc
-SPTK/bin/mgclsp2mgc.sh
+SPTK/bin/mgclsp2sp
 SPTK/bin/mglsadf
 SPTK/bin/minmax
 SPTK/bin/mlpg
@@ -92,6 +88,7 @@ SPTK/bin/mlsacheck
 SPTK/bin/mlsadf
 SPTK/bin/msvq
 SPTK/bin/nan
+SPTK/bin/ndps2c
 SPTK/bin/norm0
 SPTK/bin/nrand
 SPTK/bin/par2lpc
@@ -103,7 +100,6 @@ SPTK/bin/poledf
 SPTK/bin/psgr
 SPTK/bin/ramp
 SPTK/bin/raw2wav
-SPTK/bin/raw2wav.sh
 SPTK/bin/rawtowav
 SPTK/bin/reverse
 SPTK/bin/rmse
@@ -122,15 +118,15 @@ SPTK/bin/uels
 SPTK/bin/ulaw
 SPTK/bin/us
 SPTK/bin/us16
-SPTK/bin/us16.sh
 SPTK/bin/uscd
-SPTK/bin/uscd.sh
+SPTK/bin/vc
 SPTK/bin/vopr
 SPTK/bin/vq
 SPTK/bin/vstat
 SPTK/bin/vsum
 SPTK/bin/wav2raw
-SPTK/bin/wav2raw.sh
+SPTK/bin/wavjoin
+SPTK/bin/wavsplit
 SPTK/bin/window
 SPTK/bin/x2x
 SPTK/bin/xgr
@@ -143,12 +139,15 @@ SPTK/share/SPTK/lpfcoef.2to3f
 SPTK/share/SPTK/lpfcoef.2to3s
 SPTK/share/SPTK/lpfcoef.3to2
 SPTK/share/SPTK/lpfcoef.3to4
+SPTK/share/SPTK/lpfcoef.3to5
 SPTK/share/SPTK/lpfcoef.4to3
 SPTK/share/SPTK/lpfcoef.4to5
 SPTK/share/SPTK/lpfcoef.5to2dn
 SPTK/share/SPTK/lpfcoef.5to2up
 SPTK/share/SPTK/lpfcoef.5to7
 SPTK/share/SPTK/lpfcoef.5to8
+SPTK/share/SPTK/lpfcoef.7to4
+SPTK/share/SPTK/lpfcoef.7to8
 share/doc/sptk/README
 share/doc/sptk/SPTKexamples-${PKGVERSION}.pdf
 share/doc/sptk/SPTKref-${PKGVERSION}.pdf
diff --git a/audio/sptk/distinfo b/audio/sptk/distinfo
index 9386f02bac8..9209a7b7d5c 100644
--- a/audio/sptk/distinfo
+++ b/audio/sptk/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 01:12:52 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/07/10 12:06:21 mef Exp $
 
-SHA1 (SPTK-3.6.tar.gz) = ecc5190c08cc64e40bd1274398a54e1556eb0206
-RMD160 (SPTK-3.6.tar.gz) = e7c324af7130b862a897f7ef997da05d1b1a99d1
-SHA512 (SPTK-3.6.tar.gz) = fe2d8e263fef38ed917d579656b8005f7c18d71fcc5ecacf4997e1ec6f0123f8087fc53d4a60b75db665e45524b658a505dfacff2e86e09808ae5971c6f1d34f
-Size (SPTK-3.6.tar.gz) = 674941 bytes
-SHA1 (SPTKexamples-3.6.pdf) = affd351e043783a0ecce5013aab1b0a0530075e1
-RMD160 (SPTKexamples-3.6.pdf) = b4bdc6551f6ec673c4e1382627bb3066c1a1419f
-SHA512 (SPTKexamples-3.6.pdf) = 74c7a4d429cc09b984ee771d8331ce90af3f09322b2a4abbe0a9e035ce9006631ae0cc333706d0faee9e1c5ddca8ac35a09e2375b2b4cfaed3fb611d4bee03c6
-Size (SPTKexamples-3.6.pdf) = 2409914 bytes
-SHA1 (SPTKref-3.6.pdf) = eebd4ed6dfb7536a10cbb2379bd17e71f2331a23
-RMD160 (SPTKref-3.6.pdf) = bda884198f437c78eda6ded60f5087c40dbaad07
-SHA512 (SPTKref-3.6.pdf) = 030aadbdcbc937f3a5cacdf5eaf1280379a1a2520bf282f278cea8da29cd691d07e3fcffde6eb56a8669c7bdf266bce58cc56bc9a0d3058d4d8d1f170b9411fb
-Size (SPTKref-3.6.pdf) = 1155970 bytes
-SHA1 (patch-bin_pitch_swipe_swipe.c) = 9e94f498992938fda8886dd93283627c2901513a
+SHA1 (SPTK-3.9.tar.gz) = 76eb657d9b7b7005090ec2515d7c02da4fa69b74
+RMD160 (SPTK-3.9.tar.gz) = c19b651e653cf26b49e2220afd8cd435bd255089
+SHA512 (SPTK-3.9.tar.gz) = b4005c83723d07c873240f48ab66af476017211151ee69b1b4abc2478604bae1c7794906a95d9e6ff4d2c7e4fd6687cab95470abb5f2f15cb75ad57327cae86e
+Size (SPTK-3.9.tar.gz) = 1077702 bytes
+SHA1 (SPTKexamples-3.9.pdf) = 1a0588b36de6da08df45f35ccf950269899fb23e
+RMD160 (SPTKexamples-3.9.pdf) = cf5cfbc4908246a380080195fa15ec8baa2967ae
+SHA512 (SPTKexamples-3.9.pdf) = 56d1e22d99567e46ff5fc050aebf72eb327aad6872635b1a627d69d89e008fd39e170f82bce7b4bb847bde8e7ab23e91afb84acb7046ef4dec1494e4f7d73e49
+Size (SPTKexamples-3.9.pdf) = 2752695 bytes
+SHA1 (SPTKref-3.9.pdf) = 01c4d94bbf3b2b6ccad25b68dacf90cad7cc7adb
+RMD160 (SPTKref-3.9.pdf) = 4f6650ea5e648ebc602e60b1c51b7e334344b17e
+SHA512 (SPTKref-3.9.pdf) = d145adad6cfc78d8e04f546feb6eaf17e27f79a3f03e1af9ff86f213b675e4648d965670e1fa3f62d4101f9bacebf7a710947c70d7f302fe7c694c8f73e6d31c
+Size (SPTKref-3.9.pdf) = 1044287 bytes
+SHA1 (patch-bin_pitch_swipe_swipe.c) = af7013843ddf1a801be32d10c65f8ec525c481c2
+SHA1 (patch-bin_vc_hts__engine__API_HTS__misc.c) = cc4a4ab182e93323280d3b777e3eef4bc55050fa
diff --git a/audio/sptk/patches/patch-bin_pitch_swipe_swipe.c b/audio/sptk/patches/patch-bin_pitch_swipe_swipe.c
index 5d3c9994f7d..ffa61b18563 100644
--- a/audio/sptk/patches/patch-bin_pitch_swipe_swipe.c
+++ b/audio/sptk/patches/patch-bin_pitch_swipe_swipe.c
@@ -1,10 +1,11 @@
-$NetBSD: patch-bin_pitch_swipe_swipe.c,v 1.1 2014/02/22 14:19:36 wiedi Exp $
+$NetBSD: patch-bin_pitch_swipe_swipe.c,v 1.2 2016/07/10 12:06:21 mef Exp $
 
 include values.h for M_PI on SunOS
---- bin/pitch/swipe/swipe.c.orig	2012-12-22 12:25:38.000000000 +0000
-+++ bin/pitch/swipe/swipe.c
-@@ -80,6 +80,9 @@
- #endif
+
+--- bin/pitch/swipe/swipe.c.orig	2015-12-14 14:38:40.000000000 +0900
++++ bin/pitch/swipe/swipe.c	2016-07-10 20:52:54.000000000 +0900
+@@ -70,6 +70,9 @@
+ #define VNUM    1.5 // current version
  
  #include <math.h>
 +#if defined(__sun)
diff --git a/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c b/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
new file mode 100644
index 00000000000..7f4036a2ae1
--- /dev/null
+++ b/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-bin_vc_hts__engine__API_HTS__misc.c,v 1.1 2016/07/10 12:06:21 mef Exp $
+
+hts_engine_API/HTS_misc.c: In function 'HTS_ftell':
+hts_engine_API/HTS_misc.c:251:26: error: 'fpos_t' has no member named '__pos'
+
+--- bin/vc/hts_engine_API/HTS_misc.c~	2015-12-25 15:10:53.000000000 +0900
++++ bin/vc/hts_engine_API/HTS_misc.c	2016-07-10 21:01:30.000000000 +0900
+@@ -245,10 +245,14 @@ size_t HTS_ftell(HTS_File * fp)
+    } else if (fp->type == HTS_FILE) {
+       fpos_t pos;
+       fgetpos((FILE *) fp->pointer, &pos);
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) 
+       return (size_t) pos;
+ #else
++#  if defined(__NetBSD__)
++      return (size_t) pos._pos;
++#  else
+       return (size_t) pos.__pos;
++#  endif
+ #endif                          /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
+    } else if (fp->type == HTS_DATA) {
+       HTS_Data *d = (HTS_Data *) fp->pointer;