Attachment #163438 for bug #204754

View | Details | Raw Unified | Return to bug 204754
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	festival
PORTVERSION=	2.4
PORTREVISION=	1
CATEGORIES=	audio accessibility
MASTER_SITES=	FESTIVAL
DISTFILES=	${DISTNAME}-release.tar.gz 	\

		EST_HOME=${SPEECHTOOLS}
WRKSRC=		${WRKDIR}

SPT_PATCHES=	include_ling__class_EST__FeatureFunctionPackage.h	\
		include_unix_EST__socket__unix.h
		base__class_inst__tmpl_vector__dvector__t.cc	\
		base__class_inst__tmpl_vector__fmatrix__t.cc	\
		config_compilers_gcc__defaults.mak	\
		include_EST__Ngrammar.h	\
		include_EST__SCFG.h	\
		include_EST__String.h	\
		include_EST__error.h	\
		include_ling__class_EST__FeatureFunctionPackage.h	\
		include_unix_EST__socket__unix.h	\
		stats_dynamic__program.cc	\
		utils_EST__ServiceTable.cc

do-build:
.for d in speech_tools festival




SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84
SIZE (festival/festival-2.4-release.tar.gz) = 788656
SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010
SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613
SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104
SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870
SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048

SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519
SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74
SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068
SHA256 (festival/patch-speech__tools_include_EST__TIterator.h) = c44d8125a04447a63e8458cee910cd7fe4aa84d31d4c06139b76ae168c66bcf7
SIZE (festival/patch-speech__tools_include_EST__TIterator.h) = 730
SHA256 (festival/patch-speech__tools_include_EST__TNamedEnum.h) = c825a92c81ecdda555963319c400a026aa797c694897e2a6a232ea94660d6557
SIZE (festival/patch-speech__tools_include_EST__TNamedEnum.h) = 608
SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5
SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210
SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157




(blindly) adapted to Festival 2.4

Obtained from:
	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667377


 #include "EST_cutils.h"
 
 template<class T> 
@@ -98,7 +99,7 @@ void EST_TSimpleMatrix<T>::resize(int ne
 	{
 	  int copy_r = Lof(this->num_rows(), new_rows);
 
-	  just_resize(new_rows, new_cols, &old_vals);
+	  this->just_resize(new_rows, new_cols, &old_vals);
 
           for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
               ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
@@ -127,9 +128,9 @@ void EST_TSimpleMatrix<T>::resize(int ne
 	  int copy_r = Lof(this->num_rows(), new_rows);
 	  int copy_c = Lof(this->num_columns(), new_cols);
 	  
-	  just_resize(new_rows, new_cols, &old_vals);
+	  this->just_resize(new_rows, new_cols, &old_vals);
 
-	  set_values(old_vals,
+	  this->set_values(old_vals,
 		     old_row_step, old_column_step,
 		     0, copy_r,
 		     0, copy_c);
--- speech_tools/base_class/EST_TSimpleVector.cc
+++ speech_tools/base_class/EST_TSimpleVector.cc
@@ -43,6 +43,7 @@

 #include "EST_cutils.h"
 
 template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
@@ -70,7 +71,7 @@ template<class T> void EST_TSimpleVector
   int old_offset = this->p_offset;
   unsigned int q;
 
-  just_resize(newn, &old_vals);
+  this->just_resize(newn, &old_vals);
 
   if (set && old_vals)
     {
--- speech_tools/include/EST_TIterator.h
+++ speech_tools/include/EST_TIterator.h
@@ -209,7 +209,7 @@ public:
 
   /// Create an iterator ready to run over the given container.
   EST_TStructIterator(const Container &over)
-    { begin(over); }
+    { this->begin(over); }
 
   const Entry *operator ->() const
     {return &this->current();}
@@ -289,7 +289,7 @@ public:
 
   /// Create an iterator ready to run over the given container.
   EST_TRwStructIterator(Container &over)
-    { begin(over); }
+    { this->begin(over); }
 
   Entry *operator ->() const
     {return &this->current();}
--- speech_tools/include/EST_TNamedEnum.h
+++ speech_tools/include/EST_TNamedEnum.h
@@ -130,7 +130,7 @@ public:
 	{this->initialise((const void *)defs); };
   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
 	{this->initialise((const void *)defs, conv); };
-  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
+  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
 
 };
 




--- festival/src/modules/hts_engine/HTS_misc.c.orig	2013-07-03 19:43:35.000000000 +0600
+++ festival/src/modules/hts_engine/HTS_misc.c	2015-11-22 20:43:30.055818000 +0500
@@ -245,11 +245,7 @@
    } else if (fp->type == HTS_FILE) {
       fpos_t pos;
       fgetpos((FILE *) fp->pointer, &pos);
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__)
       return (size_t) pos;
-#else
-      return (size_t) pos.__pos;
-#endif                          /* _WIN32 || __APPLE__ */
    }
    HTS_error(0, "HTS_ftell: Unknown file type.\n");
    return 0;




(blindly) adapted to Festival 2.4

#$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.1 2013/06/13 21:40:43 joerg Exp $

--- speech_tools/config/compilers/gcc_defaults.mak.orig	2010-02-03 12:28:14.000000000 +0000
+++ speech_tools/config/compilers/gcc_defaults.mak
@@ -39,10 +39,7 @@
  ###########################################################################
 
 CC=gcc
-CXX=gcc
-ifeq ($(OSTYPE),Darwin)
 CXX=g++
-endif
 
 COMPILER_DESC=FSF gcc
 COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//'
@@ -98,7 +95,7 @@ TEMPLATE_ARGS = 
 ## The -lgcc here is redundant - gcc does this anyway - but it
 ## helps java know what needs to be loaded.
 
-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
 
 ## special ways of doing things, blank means default
 




(blindly) adapted to Festival 2.4

#$NetBSD: patch-speech__tools_include_EST__Ngrammar.h,v 1.2 2013/07/18 20:19:51 joerg Exp $

--- speech_tools/include/EST_Ngrammar.h.orig	2013-07-17 14:46:59.000000000 +0000
+++ speech_tools/include/EST_Ngrammar.h
@@ -584,6 +584,12 @@ friend class EST_BackoffNgrammar;
     
 };
 
+void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0);
+void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0);
+bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0);
+void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount,
+				 const double default_discount=0.5);
+
 void Ngram_freqsmooth(EST_Ngrammar &ngram,
 		      int smooth_thresh1,
 		      int smooth_thresh2);




(blindly) adapted to Festival 2.4

#$NetBSD: patch-speech__tools_include_EST__String.h,v 1.1 2013/07/18 11:57:42 joerg Exp $

--- speech_tools/include/EST_String.h.orig	2013-07-17 14:40:20.000000000 +0000
+++ speech_tools/include/EST_String.h
@@ -647,6 +647,12 @@ int operator == (const char *a, const ES
 int operator == (const EST_String &a, const EST_String &b);
 ostream &operator << (ostream &s, const EST_String &str);
 
+int fcompare(const EST_String &a, const EST_String &b, 
+	     const unsigned char *table=NULL);
+ 
+int fcompare(const EST_String &a, const char *b, 
+	     const unsigned char *table=NULL);
+
 #include "EST_Regex.h"
 
 #endif	




 #include <fcntl.h>
-int linux16_supported = TRUE;
-int freebsd16_supported = FALSE;
-static const char *aud_sys_name = "Linux";
+
 static int stereo_only = 0;
 
@@ -764,5 +768,5 @@
     int audio,actual_fmt;
     int i,r,n;
-    char *audiodevice;
+    const char *audiodevice;
 
     if (al.present("-audiodevice"))
@@ -279,5 +283,5 @@
     int audio=-1,actual_fmt;
     int i,r,n;
-    char *audiodevice;

Lines 26-37 Link Here

(-)audio/festival/pkg-plist (-2 / +4 lines)
26	%%DATADIR%%/examples/intro.text	26	%%DATADIR%%/examples/intro.text
27	%%DATADIR%%/examples/latest	27	%%DATADIR%%/examples/latest
28	%%DATADIR%%/examples/latest.sh	28	%%DATADIR%%/examples/latest.sh
29	%%DATADIR%%/examples/run-festival-script
30	%%DATADIR%%/examples/run-festival-script.sh
31	%%DATADIR%%/examples/make_utts	29	%%DATADIR%%/examples/make_utts
32	%%DATADIR%%/examples/make_utts.sh	30	%%DATADIR%%/examples/make_utts.sh
33	%%DATADIR%%/examples/powmeanstd	31	%%DATADIR%%/examples/powmeanstd
34	%%DATADIR%%/examples/powmeanstd.sh	32	%%DATADIR%%/examples/powmeanstd.sh
		33	%%DATADIR%%/examples/run-festival-script
		34	%%DATADIR%%/examples/run-festival-script.sh
35	%%DATADIR%%/examples/saytime	35	%%DATADIR%%/examples/saytime
36	%%DATADIR%%/examples/saytime.sh	36	%%DATADIR%%/examples/saytime.sh
37	%%DATADIR%%/examples/scfg_parse_text	37	%%DATADIR%%/examples/scfg_parse_text
Lines 52-57 Link Here
52	%%DATADIR%%/examples/spintro.text	52	%%DATADIR%%/examples/spintro.text
53	%%DATADIR%%/examples/text2pos	53	%%DATADIR%%/examples/text2pos
54	%%DATADIR%%/examples/text2pos.sh	54	%%DATADIR%%/examples/text2pos.sh
		55	%%DATADIR%%/examples/text2utt
		56	%%DATADIR%%/examples/text2utt.sh
55	%%DATADIR%%/examples/text2wave	57	%%DATADIR%%/examples/text2wave
56	%%DATADIR%%/examples/text2wave.sh	58	%%DATADIR%%/examples/text2wave.sh
57	%%DATADIR%%/examples/th-mode.scm	59	%%DATADIR%%/examples/th-mode.scm

Return to bug 204754

Lines 2-9 Link Here

(-)audio/festival/Makefile (-15 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= festival	4	PORTNAME= festival
5	PORTVERSION= 2.1	5	PORTVERSION= 2.4
6	PORTREVISION= 1
7	CATEGORIES= audio accessibility	6	CATEGORIES= audio accessibility
8	MASTER_SITES= FESTIVAL	7	MASTER_SITES= FESTIVAL
9	DISTFILES= ${DISTNAME}-release.tar.gz \	8	DISTFILES= ${DISTNAME}-release.tar.gz \
Lines 41-59 Link Here
41	EST_HOME=${SPEECHTOOLS}	40	EST_HOME=${SPEECHTOOLS}
42	WRKSRC= ${WRKDIR}	41	WRKSRC= ${WRKDIR}
43		42
44	SPT_PATCHES= base__class_EST__TVector.cc \	43	SPT_PATCHES= include_ling__class_EST__FeatureFunctionPackage.h \
45	base__class_inst__tmpl_vector__dmatrix__t.cc \	44	include_unix_EST__socket__unix.h
46	base__class_inst__tmpl_vector__dvector__t.cc \
47	base__class_inst__tmpl_vector__fmatrix__t.cc \
48	config_compilers_gcc__defaults.mak \
49	include_EST__Ngrammar.h \
50	include_EST__SCFG.h \
51	include_EST__String.h \
52	include_EST__error.h \
53	include_ling__class_EST__FeatureFunctionPackage.h \
54	include_unix_EST__socket__unix.h \
55	stats_dynamic__program.cc \
56	utils_EST__ServiceTable.cc
57		45
58	do-build:	46	do-build:
59	.for d in speech_tools festival	47	.for d in speech_tools festival

Lines 1-7 Link Here

(-)audio/festival/distinfo (-8 / +4 lines)
1	SHA256 (festival/festival-2.1-release.tar.gz) = 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080	1	SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84
2	SIZE (festival/festival-2.1-release.tar.gz) = 787313	2	SIZE (festival/festival-2.4-release.tar.gz) = 788656
3	SHA256 (festival/speech_tools-2.1-release.tar.gz) = ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9	3	SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010
4	SIZE (festival/speech_tools-2.1-release.tar.gz) = 1681999	4	SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613
5	SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104	5	SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104
6	SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870	6	SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870
7	SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048	7	SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048
Lines 36-45 Link Here
36	SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519	36	SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519
37	SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74	37	SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74
38	SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068	38	SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068
39	SHA256 (festival/patch-speech__tools_include_EST__TIterator.h) = c44d8125a04447a63e8458cee910cd7fe4aa84d31d4c06139b76ae168c66bcf7
40	SIZE (festival/patch-speech__tools_include_EST__TIterator.h) = 730
41	SHA256 (festival/patch-speech__tools_include_EST__TNamedEnum.h) = c825a92c81ecdda555963319c400a026aa797c694897e2a6a232ea94660d6557
42	SIZE (festival/patch-speech__tools_include_EST__TNamedEnum.h) = 608
43	SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5	39	SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5
44	SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210	40	SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210
45	SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157	41	SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157

Lines 1-3 Link Here

(-)audio/festival/files/patch-debian-bug-667377 (-61 / +2 lines)
		1	(blindly) adapted to Festival 2.4
		2
1	Obtained from:	3	Obtained from:
2	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667377	4	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667377
3		5
Lines 20-46 Link Here
20	#include "EST_cutils.h"	22	#include "EST_cutils.h"
21		23
22	template<class T>	24	template<class T>
23	@@ -98,7 +99,7 @@ void EST_TSimpleMatrix<T>::resize(int ne
24	{
25	int copy_r = Lof(this->num_rows(), new_rows);
26
27	- just_resize(new_rows, new_cols, &old_vals);
28	+ this->just_resize(new_rows, new_cols, &old_vals);
29
30	for (q=0; q<(copy_rnew_colssizeof(T)); q++) /* memcpy */
31	((char )this->p_memory)[q] = ((char )old_vals)[q];
32	@@ -127,9 +128,9 @@ void EST_TSimpleMatrix<T>::resize(int ne
33	int copy_r = Lof(this->num_rows(), new_rows);
34	int copy_c = Lof(this->num_columns(), new_cols);
35
36	- just_resize(new_rows, new_cols, &old_vals);
37	+ this->just_resize(new_rows, new_cols, &old_vals);
38
39	- set_values(old_vals,
40	+ this->set_values(old_vals,
41	old_row_step, old_column_step,
42	0, copy_r,
43	0, copy_c);
44	--- speech_tools/base_class/EST_TSimpleVector.cc	25	--- speech_tools/base_class/EST_TSimpleVector.cc
45	+++ speech_tools/base_class/EST_TSimpleVector.cc	26	+++ speech_tools/base_class/EST_TSimpleVector.cc
46	@@ -43,6 +43,7 @@	27	@@ -43,6 +43,7 @@
Lines 51-93 Link Here
51	#include "EST_cutils.h"	32	#include "EST_cutils.h"
52		33
53	template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)	34	template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
54	@@ -70,7 +71,7 @@ template<class T> void EST_TSimpleVector
55	int old_offset = this->p_offset;
56	unsigned int q;
57
58	- just_resize(newn, &old_vals);
59	+ this->just_resize(newn, &old_vals);
60
61	if (set && old_vals)
62	{
63	--- speech_tools/include/EST_TIterator.h
64	+++ speech_tools/include/EST_TIterator.h
65	@@ -209,7 +209,7 @@ public:
66
67	/// Create an iterator ready to run over the given container.
68	EST_TStructIterator(const Container &over)
69	- { begin(over); }
70	+ { this->begin(over); }
71
72	const Entry *operator ->() const
73	{return &this->current();}
74	@@ -289,7 +289,7 @@ public:
75
76	/// Create an iterator ready to run over the given container.
77	EST_TRwStructIterator(Container &over)
78	- { begin(over); }
79	+ { this->begin(over); }
80
81	Entry *operator ->() const
82	{return &this->current();}
83	--- speech_tools/include/EST_TNamedEnum.h
84	+++ speech_tools/include/EST_TNamedEnum.h
85	@@ -130,7 +130,7 @@ public:
86	{this->initialise((const void *)defs); };
87	EST_TNamedEnumI(EST_TValuedEnumDefinition<const char ,const char ,INFO> defs[], ENUM (conv)(const char ))
88	{this->initialise((const void *)defs, conv); };
89	- const char *name(ENUM tok, int n=0) const {return value(tok,n); };
90	+ const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
91
92	};
93

Line 0 Link Here

(-)audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c (+14 lines)
	1	--- festival/src/modules/hts_engine/HTS_misc.c.orig 2013-07-03 19:43:35.000000000 +0600
	2	+++ festival/src/modules/hts_engine/HTS_misc.c 2015-11-22 20:43:30.055818000 +0500
	3	@@ -245,11 +245,7 @@
	4	} else if (fp->type == HTS_FILE) {
	5	fpos_t pos;
	6	fgetpos((FILE *) fp->pointer, &pos);
	7	-#if defined(_WIN32) \|\| defined(__CYGWIN__) \|\| defined(__APPLE__)
	8	return (size_t) pos;
	9	-#else
	10	- return (size_t) pos.__pos;
	11	-#endif /* _WIN32 \|\| __APPLE__ */
	12	}
	13	HTS_error(0, "HTS_ftell: Unknown file type.\n");
	14	return 0;

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_config_compilers_gcc__defaults.mak (+26 lines)
	1	(blindly) adapted to Festival 2.4
	2
	3	#$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.1 2013/06/13 21:40:43 joerg Exp $
	4
	5	--- speech_tools/config/compilers/gcc_defaults.mak.orig 2010-02-03 12:28:14.000000000 +0000
	6	+++ speech_tools/config/compilers/gcc_defaults.mak
	7	@@ -39,10 +39,7 @@
	8	###########################################################################
	9
	10	CC=gcc
	11	-CXX=gcc
	12	-ifeq ($(OSTYPE),Darwin)
	13	CXX=g++
	14	-endif
	15
	16	COMPILER_DESC=FSF gcc
	17	COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 \| tail -1 \| sed -e 's/^....//'
	18	@@ -98,7 +95,7 @@ TEMPLATE_ARGS =
	19	## The -lgcc here is redundant - gcc does this anyway - but it
	20	## helps java know what needs to be loaded.
	21
	22	-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++
	23	+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
	24
	25	## special ways of doing things, blank means default
	26

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_include_EST__Ngrammar.h (+19 lines)
	1	(blindly) adapted to Festival 2.4
	2
	3	#$NetBSD: patch-speech__tools_include_EST__Ngrammar.h,v 1.2 2013/07/18 20:19:51 joerg Exp $
	4
	5	--- speech_tools/include/EST_Ngrammar.h.orig 2013-07-17 14:46:59.000000000 +0000
	6	+++ speech_tools/include/EST_Ngrammar.h
	7	@@ -584,6 +584,12 @@ friend class EST_BackoffNgrammar;
	8
	9	};
	10
	11	+void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0);
	12	+void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0);
	13	+bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0);
	14	+void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount,
	15	+ const double default_discount=0.5);
	16	+
	17	void Ngram_freqsmooth(EST_Ngrammar &ngram,
	18	int smooth_thresh1,
	19	int smooth_thresh2);

Lines 29-46 Link Here

(-)audio/festival/files/patch-voxware (-9 / +2 lines)
29	#include <fcntl.h>	29	#include <fcntl.h>
30	-int linux16_supported = TRUE;	30	-int linux16_supported = TRUE;
31	-int freebsd16_supported = FALSE;	31	-int freebsd16_supported = FALSE;
32	-static char *aud_sys_name = "Linux";	32	-static const char *aud_sys_name = "Linux";
33	+	33	+
34	static int stereo_only = 0;	34	static int stereo_only = 0;
35		35
36	@@ -152,5 +156,5 @@	36	@@ -764,5 +768,5 @@
37	int audio,actual_fmt;
38	int i,r,n;
39	- char *audiodevice;
40	+ const char *audiodevice;
41
42	if (al.present("-audiodevice"))
43	@@ -279,5 +283,5 @@
44	int audio=-1,actual_fmt;	37	int audio=-1,actual_fmt;
45	int i,r,n;	38	int i,r,n;
46	- char *audiodevice;	39	- char *audiodevice;