flite: update to 2.2

Changes:

Better grapheme support for hundreds of new languages as part of Wilderness project (http://www.festvox.org/cmu_wilderness/)

Also includes updated G2P rules for indic

4 files changed, 19 insertions, 63 deletions

diff --git a/audio/flite/Makefile b/audio/flite/Makefile
index 27d58286b95..1583f231793 100644
--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.11 2019/09/09 09:46:38 nia Exp $
+# $NetBSD: Makefile,v 1.12 2021/04/17 09:24:50 nia Exp $
 #
 
-DISTNAME=	flite-2.1-release
-PKGNAME=	${DISTNAME:S/-release//}
+DISTNAME=	flite-2.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.festvox.org/flite/packed/flite-2.1/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=festvox/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.festvox.org/flite/
 COMMENT=	Lightweight text to speech synthesis engine
+LICENSE=	modified-bsd AND zlib
 
 # Error opening output file '[...]/cmu_us_kal_diphone.o': No such file or directory
 MAKE_JOBS_SAFE=	no
@@ -29,5 +29,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${DESTDIR}${PREFIX}/include/flite
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/flite
 
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/flite/distinfo b/audio/flite/distinfo
index 4fefb112f06..649f796766a 100644
--- a/audio/flite/distinfo
+++ b/audio/flite/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.10 2019/09/07 11:42:49 nia Exp $
+$NetBSD: distinfo,v 1.11 2021/04/17 09:24:50 nia Exp $
 
-SHA1 (flite-2.1-release.tar.bz2) = ed8f1ae3c44dafc2bcc70df4ebf618330f7edec9
-RMD160 (flite-2.1-release.tar.bz2) = ebd73639e65043467dffe5d9e7700f6ced5bfe1b
-SHA512 (flite-2.1-release.tar.bz2) = e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2
-Size (flite-2.1-release.tar.bz2) = 14816327 bytes
-SHA1 (patch-CVE-2014-0027) = aae5a7e965cfe41af05c3917f6574f223185aeff
+SHA1 (flite-2.2.tar.gz) = 687cace51875b15d2f10dba0732dfc0634571bb8
+RMD160 (flite-2.2.tar.gz) = 86b66adeb328878d5cafb7e67bb203b734edeb66
+SHA512 (flite-2.2.tar.gz) = 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
+Size (flite-2.2.tar.gz) = 20233792 bytes
 SHA1 (patch-ad) = e75da7826581a1d93d4f5efe75f257cc749358a7
-SHA1 (patch-ae) = c1bd0e1baea7464d3ef0d35481714f92af3da4d8
+SHA1 (patch-ae) = 68bd8745c75143e211966eefcfdc4b094f54e6a3
 SHA1 (patch-config_common__make__rules) = 949ec45c35872fd39c44864b484423ab28467898
diff --git a/audio/flite/patches/patch-CVE-2014-0027 b/audio/flite/patches/patch-CVE-2014-0027
deleted file mode 100644
index d056f712b3b..00000000000
--- a/audio/flite/patches/patch-CVE-2014-0027
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-CVE-2014-0027,v 1.1 2019/09/07 11:42:49 nia Exp $
-
-Only write audio data to a file in debug builds.
-
-This isn't useful in regular builds and is actually a security concern.
-
-https://github.com/festvox/flite/pull/3
-
---- src/audio/auserver.c.orig	2017-10-21 14:01:07.000000000 +0000
-+++ src/audio/auserver.c
-@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_hea
-     int q,i,n,r;
-     unsigned char bytes[CST_AUDIOBUFFSIZE];
-     short shorts[CST_AUDIOBUFFSIZE];
-+#ifdef DEBUG
-     cst_file fff;
- 
-     fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
-+#endif
- 
-     if ((audio_device = audio_open(header->sample_rate,1,
- 				   (header->encoding == CST_SND_SHORT) ?
-@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_hea
- 	for (q=r; q > 0; q-=n)
- 	{
- 	    n = audio_write(audio_device,shorts,q);
-+#ifdef DEBUG
- 	    cst_fwrite(fff,shorts,2,q);
-+#endif
- 	    if (n <= 0)
- 	    {
- 		audio_close(audio_device);
-@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_hea
- 	}
-     }
-     audio_close(audio_device);
-+#ifdef DEBUG
-     cst_fclose(fff);
-+#endif
- 
-     return CST_OK_FORMAT;
- 
diff --git a/audio/flite/patches/patch-ae b/audio/flite/patches/patch-ae
index 28637201fe6..783e309f844 100644
--- a/audio/flite/patches/patch-ae
+++ b/audio/flite/patches/patch-ae
@@ -1,7 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2007/07/08 18:33:38 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2021/04/17 09:24:50 nia Exp $
 
---- src/audio/au_sun.c.orig	Mon Jan  7 18:25:52 2002
-+++ src/audio/au_sun.c	Sun Apr 20 18:12:34 2003
+- Include missing header
+- Use AUDIO_INITINFO for parameter initialization
+
+--- src/audio/au_sun.c.orig	2020-08-13 00:17:09.000000000 +0000
++++ src/audio/au_sun.c
 @@ -45,6 +45,7 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -10,15 +13,12 @@ $NetBSD: patch-ae,v 1.1 2007/07/08 18:33:38 minskim Exp $
  #include <sys/filio.h>
  #include <sys/audioio.h>
  #include "cst_string.h"
-@@ -76,7 +77,11 @@ cst_audiodev *audio_open_sun(int sps, in
+@@ -76,7 +77,7 @@ cst_audiodev *audio_open_sun(int sps, in
  	    cst_error();
  	}
      }
-+#ifdef __OpenBSD__
+-    ioctl(fd,AUDIO_GETINFO,&ainfo);
 +    AUDIO_INITINFO(&ainfo);
-+#else
-     ioctl(fd,AUDIO_GETINFO,&ainfo);
-+#endif
  
      switch (fmt)
      {