Attachment #193912 for bug #228521




# $FreeBSD$

PORTNAME=	festival
DISTVERSION=	2.5.0
CATEGORIES=	audio accessibility
MASTER_SITES=	FESTIVAL/2.5
DISTFILES=	${DISTNAME}-release.tar.gz	\
		speech_tools-${DISTVERSION}-release.tar.gz
DIST_SUBDIR=	festival

PATCHFILES=	src_modules_diphone_diphone.h.diff?id=b58a836:debian	\

		languagespatch.diff?id=b58a836:debian	\
		${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/}
PATCH_SITES=	ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd	\
		http://salsa.debian.org/tts-team/festival.git/plain/debian/patches/:debian

MAINTAINER=	mi@aldan.algebra.com
COMMENT=	Multi-lingual speech synthesis system

LICENSE_FILE=	COPYING

OPTIONS_DEFINE=	NAS ESD
OPTIONS_DEFAULT=NAS ESD
ESD_DESC=	${ESOUND_DESC}




TIMESTAMP = 1527179004
SHA256 (festival/festival-2.5.0-release.tar.gz) = 4c9007426b125290599d931df410e2def51e68a8aeebd89b4a61c7c96c09a4b4
SIZE (festival/festival-2.5.0-release.tar.gz) = 789013
SHA256 (festival/speech_tools-2.5.0-release.tar.gz) = e4fd97ed78f14464358d09f36dfe91bc1721b7c0fa6503e04364fb5847805dcc
SIZE (festival/speech_tools-2.5.0-release.tar.gz) = 1328624
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/hts21compat.diff?id=b58a836) = 125719
SHA256 (festival/languagespatch.diff?id=b58a836) = 3108f08656d31623ee5393eb542d0085819a056641c1853c2ffc2b07e2e9e15a
SIZE (festival/languagespatch.diff?id=b58a836) = 36538
SHA256 (festival/patch-speech__tools_base__class_EST__TVector.cc) = d791a9feb1e2be33fb8d367a8add65678b3f0e45cee145e8381d0f18eb2d9b0f
SIZE (festival/patch-speech__tools_base__class_EST__TVector.cc) = 454
SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 19b6c8f14c3b8944dc2404b92c74c5e0b2403f35b96a152f18b9492d9b24e4ee
SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 1086
SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 713c9938950e2190c503e9619e0142db49bdf6378b60de3611c4390ba7cdb5cb
SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 1086
SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = aa16df118317354d368a5389c18a157723df10f09af319e278eb63d4ab73ee31
SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1085
SHA256 (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = ac6e1db2a4e7c99929d4713d70b86014ecbe71d1c5f4f67e91503887a225f718
SIZE (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = 803
SHA256 (festival/patch-speech__tools_include_EST__Ngrammar.h) = 156d42e187693d6e76d28c280155bc6dfd6de6d8a5225d4aa87a2e767d0cee96
SIZE (festival/patch-speech__tools_include_EST__Ngrammar.h) = 2519
SHA256 (festival/patch-speech__tools_include_EST__SCFG.h) = e6ec64c01faad49f0efb2e40d7b332e0b7a8e92830337eb1f3843780e6c9c3e6
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__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
SIZE (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 514
SHA256 (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = ad217f952ddd714c2b6b9e5924bfaf9e3b0429ba46d1db117ca1c4918aed9741
SIZE (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = 534
SHA256 (festival/patch-speech__tools_stats_dynamic__program.cc) = 0c3fbe07a256be395e28d08e367e80b53d56885825ff29a232793c8e03915141
SIZE (festival/patch-speech__tools_stats_dynamic__program.cc) = 1106
SHA256 (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 5edb267faa21adf31b5503cf5db4e55d4ad2c3eaecf1550d7df1ef8cb94c448c
SIZE (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 649




$NetBSD: patch-ah,v 1.1 2000/05/05 20:54:57 hubertf Exp $

--- festival/config/modules/nas_audio.mak.orig	Fri May  5 21:07:15 2000
+++ festival/config/modules/nas_audio.mak	Fri May  5 21:07:29 2000
@@ -44,6 +44,6 @@
 
 AUDIO_DEFINES += -DSUPPORT_NAS
 AUDIO_INCLUDES += -I$(NAS_INCLUDE)
-MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -lX11 -lXt
+MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -Wl,-R$(X11_LIB) -lX11 -lXt
 
 




Part of Debian's patch at:
	http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff

--- festival/src/modules/MultiSyn/TargetCostRescoring.cc.orig	2017-09-04 15:54:08 UTC
+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc
@@ -82,7 +82,7 @@ void rescoreCandidates( EST_VTCandidate 
     //cerr << scores << endl;
   
     // calculate simple mean duration of some or all of candidates
-    float meandur = 0.0;
+    long meandur = 0.0;
     int n = 0;
 
     if( beam_width < 0 ){ // just average all of them
@@ -107,7 +107,7 @@ void rescoreCandidates( EST_VTCandidate 
 
     // then tweak the scores based on that
     for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
-        float cand_dur = scores(li)._dur; 
+        long cand_dur = scores(li)._dur; 
         //    cerr << scores(li)._cand->score << " ";
         scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
         //    cerr << scores(li)._cand->score << endl;




--- festival/src/modules/hts_engine/HTS_misc.c.orig	2017-09-04 15:54:08 UTC
+++ festival/src/modules/hts_engine/HTS_misc.c
@@ -245,11 +245,7 @@ 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__)
       return (size_t) pos;
-#else
-      return (size_t) pos.__pos;
-#endif                          /* _WIN32 || __APPLE__ */
    }
    HTS_error(0, "HTS_ftell: Unknown file type.\n");
    return 0;




--- 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;




Part of Debian's patch at:
	http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff

--- festival/src/modules/MultiSyn/TargetCostRescoring.cc	2011-02-16 10:35:34.000000000 -0600
+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc	2011-02-16 10:43:23.000000000 -0600
@@ -82,7 +82,7 @@
   //cerr << scores << endl;
   
   // calculate simple mean duration of some or all of candidates
-  float meandur = 0.0;
+  long meandur = 0.0;
   int n = 0;
 
   if( beam_width < 0 ){ // just average all of them
@@ -107,7 +107,7 @@
 
   // then tweak the scores based on that
   for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
-    float cand_dur = scores(li)._dur; 
+    long cand_dur = scores(li)._dur;
     //    cerr << scores(li)._cand->score << " ";
     scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
     //    cerr << scores(li)._cand->score << endl;

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_audio_nas.cc (+10 lines)
	1	--- speech_tools/audio/nas.cc.orig 2017-09-04 15:54:03 UTC
	2	+++ speech_tools/audio/nas.cc
	3	@@ -57,6 +57,7 @@ static int nas_playing = 0;
	4
	5	int nas_supported = TRUE;
	6
	7	+extern int endian_int;
	8	int endian_int = 1;
	9	#define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0)
	10




$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $

--- speech_tools/config/modules/nas_audio.mak.orig	2017-09-04 15:54:03 UTC
+++ speech_tools/config/modules/nas_audio.mak
@@ -45,6 +45,6 @@ MOD_DESC_NAS_AUDIO=Use Network Audio
 AUDIO_DEFINES += -DSUPPORT_NAS
 AUDIO_INCLUDES += -I$(NAS_INCLUDE)
 MODULE_LIBS += -L$(NAS_LIB) -laudio 
-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt
+MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt
 
 




author:  Tod McQuillin

--- speech_tools/config/rules/install.mak.orig	2017-09-04 15:54:03 UTC
+++ speech_tools/config/rules/install.mak
@@ -39,7 +39,7 @@
 
 
 
-PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd)
+PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME)
 
 PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd))
 




$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $

--- speech_tools/include/EST_unix.h.orig	2017-09-04 15:54:03 UTC
+++ speech_tools/include/EST_unix.h
@@ -53,6 +53,7 @@
 #   include <sys/wait.h>
 #   include <sys/resource.h>
 #   include <dirent.h>
+#   define unix 1
 #elif defined(SYSTEM_IS_WIN32)
 #   include <io.h>
 #   include "win32/EST_unix_win32.h"




         "    default: "DEFAULT_WINDOW"\n\n"
                        ^

--- speech_tools/main/sig2fv_main.cc.orig	2017-09-04 15:54:03 UTC
+++ speech_tools/main/sig2fv_main.cc
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 	 "-window_type <string> Type of window used on waveform. \n"
 	 "    Permissable types are: \n" +
 	 EST_Window::options_supported() + 
-	 "    default: \"DEFAULT_WINDOW\"\n\n"
+	 "    default: \" DEFAULT_WINDOW\"\n\n"
 	 "-lpc_order <int>      Order of lpc analysis. \n\n"
 	 "-ref_order <int>      Order of lpc reflection coefficient analysis. \n\n"
 	 "-cep_order <int>      Order of lpc cepstral analysis.\n\n"




--- speech_tools/audio/nas.cc.orig	Thu Oct 14 16:26:29 1999
+++ speech_tools/audio/nas.cc	Fri Jun 16 17:24:25 2000
@@ -57,7 +57,8 @@
 
 int nas_supported = TRUE;
 
-int endian_int = 1;
+extern int endian_int;
+int endian_int = 1;
 #define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0)
 
 static void na_sync_play_cb(AuServer *aud, AuEventHandlerRec *handler, 




$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $

--- speech_tools/config/modules/nas_audio.mak.orig	Fri May  5 20:55:15 2000
+++ speech_tools/config/modules/nas_audio.mak	Fri May  5 20:58:07 2000
@@ -45,6 +45,6 @@
 AUDIO_DEFINES += -DSUPPORT_NAS
 AUDIO_INCLUDES += -I$(NAS_INCLUDE)
 MODULE_LIBS += -L$(NAS_LIB) -laudio 
-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt
+MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt
 
 




$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $

--- speech_tools/include/EST_unix.h	Sun May 30 20:53:04 1999
+++ speech_tools/include/EST_unix.h	Mon Oct 11 05:40:15 1999
@@ -53,6 +53,7 @@
 #   include <sys/wait.h>
 #   include <sys/resource.h>
 #   include <dirent.h>
+#   define unix 1
 #elif defined(SYSTEM_IS_WIN32)
 #   include <io.h>
 #   include "win32/EST_unix_win32.h"




author:  Tod McQuillin

--- speech_tools/config/rules/install.mak~	Sun May 30 22:51:10 1999
+++ speech_tools/config/rules/install.mak	Wed Mar  9 03:11:35 2005
@@ -39,7 +39,7 @@
 
 
 
-PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd)
+PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME)
 
 PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd))
 

Lines 1-15 Link Here

(-)audio/festival/files/patch-voxware (-14 / +22 lines)
1	--- speech_tools/config/modules/freebsd16_audio.mak 2001-04-04 09:11:27.000000000 -0400	1	--- speech_tools/audio/linux_sound.cc.orig 2017-09-04 15:54:03 UTC
2	+++ speech_tools/config/modules/freebsd16_audio.mak 2013-05-27 13:29:03.000000000 -0400	2	+++ speech_tools/audio/linux_sound.cc
3	@@ -43,5 +43,5 @@	3	@@ -65,9 +65,15 @@
4	MOD_DESC_FREEBSD16_AUDIO=Native audio module for FreeBSD systems	4	#include <fcntl.h>
5
6	-AUDIO_DEFINES += -DSUPPORT_FREEBSD16
7	+AUDIO_DEFINES += -DSUPPORT_FREEBSD16 -DSUPPORT_VOXWARE
8
9	#ifdef INCLUDE_JAVA_CPP
10	--- speech_tools/audio/linux_sound.cc 2009-04-29 13:06:36.000000000 -0400
11	+++ speech_tools/audio/linux_sound.cc 2013-05-27 13:31:00.000000000 -0400
12	@@ -66,7 +66,13 @@
13	int freebsd16_supported = TRUE;	5	int freebsd16_supported = TRUE;
14	int linux16_supported = FALSE;	6	int linux16_supported = FALSE;
15	-static char *aud_sys_name = "FreeBSD";	7	-static char *aud_sys_name = "FreeBSD";
Lines 24-30 Link Here
24	+	16	+
25	#ifdef SUPPORT_VOXWARE	17	#ifdef SUPPORT_VOXWARE
26		18
27	@@ -76,7 +82,5 @@	19	#include <sys/ioctl.h>
		20	@@ -75,9 +81,7 @@ static char *aud_sys_name = "FreeBSD";
		21	#include <sys/types.h>
28	#include <sys/stat.h>	22	#include <sys/stat.h>
29	#include <fcntl.h>	23	#include <fcntl.h>
30	-int linux16_supported = TRUE;	24	-int linux16_supported = TRUE;
Lines 33-39 Link Here
33	+	27	+
34	static int stereo_only = 0;	28	static int stereo_only = 0;
35		29
36	@@ -764,5 +768,5 @@	30	// Code to block signals while sound is playing.
		31	@@ -771,7 +775,7 @@ int record_linux_wave(EST_Wave &inwave,
		32	int num_samples;
37	int audio=-1,actual_fmt;	33	int audio=-1,actual_fmt;
38	int i,r,n;	34	int i,r,n;
39	- char *audiodevice;	35	- char *audiodevice;
Lines 40-42 Link Here
40	+ const char *audiodevice;	36	+ const char *audiodevice;
41		37
42	if (al.present("-audiodevice"))	38	if (al.present("-audiodevice"))
		39	audiodevice = al.val("-audiodevice");
		40	--- speech_tools/config/modules/freebsd16_audio.mak.orig 2017-09-04 15:54:03 UTC
		41	+++ speech_tools/config/modules/freebsd16_audio.mak
		42	@@ -42,7 +42,7 @@ INCLUDE_FREEBSD16_AUDIO=1
		43
		44	MOD_DESC_FREEBSD16_AUDIO=Native audio module for FreeBSD systems
		45
		46	-AUDIO_DEFINES += -DSUPPORT_FREEBSD16
		47	+AUDIO_DEFINES += -DSUPPORT_FREEBSD16 -DSUPPORT_VOXWARE
		48
		49	#ifdef INCLUDE_JAVA_CPP
		50	# AUDIO_DEFINES += -DTHREAD_SAFETY

Return to bug 228521

Lines 2-12 Link Here

(-)audio/festival/Makefile (-4 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= festival	4	PORTNAME= festival
5	PORTVERSION= 2.4	5	DISTVERSION= 2.5.0
6	CATEGORIES= audio accessibility	6	CATEGORIES= audio accessibility
7	MASTER_SITES= FESTIVAL	7	MASTER_SITES= FESTIVAL/2.5
8	DISTFILES= ${DISTNAME}-release.tar.gz \	8	DISTFILES= ${DISTNAME}-release.tar.gz \
9	speech_tools-${PORTVERSION}-release.tar.gz	9	speech_tools-${DISTVERSION}-release.tar.gz
10	DIST_SUBDIR= festival	10	DIST_SUBDIR= festival
11		11
12	PATCHFILES= src_modules_diphone_diphone.h.diff?id=b58a836:debian \	12	PATCHFILES= src_modules_diphone_diphone.h.diff?id=b58a836:debian \
Lines 20-30 Link Here
20	languagespatch.diff?id=b58a836:debian \	20	languagespatch.diff?id=b58a836:debian \
21	${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/}	21	${SPT_PATCHES:C/.*/patch-speech__tools_\0:netbsd/}
22	PATCH_SITES= ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd \	22	PATCH_SITES= ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/audio/festival/patches/:netbsd \
23	http://anonscm.debian.org/cgit/tts/festival.git/plain/debian/patches/:debian	23	http://salsa.debian.org/tts-team/festival.git/plain/debian/patches/:debian
24		24
25	MAINTAINER= mi@aldan.algebra.com	25	MAINTAINER= mi@aldan.algebra.com
26	COMMENT= Multi-lingual speech synthesis system	26	COMMENT= Multi-lingual speech synthesis system
27		27
		28	LICENSE_FILE= COPYING
		29
28	OPTIONS_DEFINE= NAS ESD	30	OPTIONS_DEFINE= NAS ESD
29	OPTIONS_DEFAULT=NAS ESD	31	OPTIONS_DEFAULT=NAS ESD
30	ESD_DESC= ${ESOUND_DESC}	32	ESD_DESC= ${ESOUND_DESC}

Lines 1-7 Link Here

(-)audio/festival/distinfo (-26 / +5 lines)
1	SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84	1	TIMESTAMP = 1527179004
2	SIZE (festival/festival-2.4-release.tar.gz) = 788656	2	SHA256 (festival/festival-2.5.0-release.tar.gz) = 4c9007426b125290599d931df410e2def51e68a8aeebd89b4a61c7c96c09a4b4
3	SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010	3	SIZE (festival/festival-2.5.0-release.tar.gz) = 789013
4	SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613	4	SHA256 (festival/speech_tools-2.5.0-release.tar.gz) = e4fd97ed78f14464358d09f36dfe91bc1721b7c0fa6503e04364fb5847805dcc
		5	SIZE (festival/speech_tools-2.5.0-release.tar.gz) = 1328624
5	SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104	6	SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104
6	SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870	7	SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870
7	SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048	8	SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048
Lines 20-48 Link Here
20	SIZE (festival/hts21compat.diff?id=b58a836) = 125719	21	SIZE (festival/hts21compat.diff?id=b58a836) = 125719
21	SHA256 (festival/languagespatch.diff?id=b58a836) = 3108f08656d31623ee5393eb542d0085819a056641c1853c2ffc2b07e2e9e15a	22	SHA256 (festival/languagespatch.diff?id=b58a836) = 3108f08656d31623ee5393eb542d0085819a056641c1853c2ffc2b07e2e9e15a
22	SIZE (festival/languagespatch.diff?id=b58a836) = 36538	23	SIZE (festival/languagespatch.diff?id=b58a836) = 36538
23	SHA256 (festival/patch-speech__tools_base__class_EST__TVector.cc) = d791a9feb1e2be33fb8d367a8add65678b3f0e45cee145e8381d0f18eb2d9b0f
24	SIZE (festival/patch-speech__tools_base__class_EST__TVector.cc) = 454
25	SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 19b6c8f14c3b8944dc2404b92c74c5e0b2403f35b96a152f18b9492d9b24e4ee
26	SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 1086
27	SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 713c9938950e2190c503e9619e0142db49bdf6378b60de3611c4390ba7cdb5cb
28	SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 1086
29	SHA256 (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = aa16df118317354d368a5389c18a157723df10f09af319e278eb63d4ab73ee31
30	SIZE (festival/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1085
31	SHA256 (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = ac6e1db2a4e7c99929d4713d70b86014ecbe71d1c5f4f67e91503887a225f718
32	SIZE (festival/patch-speech__tools_config_compilers_gcc__defaults.mak) = 803
33	SHA256 (festival/patch-speech__tools_include_EST__Ngrammar.h) = 156d42e187693d6e76d28c280155bc6dfd6de6d8a5225d4aa87a2e767d0cee96
34	SIZE (festival/patch-speech__tools_include_EST__Ngrammar.h) = 2519
35	SHA256 (festival/patch-speech__tools_include_EST__SCFG.h) = e6ec64c01faad49f0efb2e40d7b332e0b7a8e92830337eb1f3843780e6c9c3e6
36	SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519
37	SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74
38	SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068
39	SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5
40	SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210
41	SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157	24	SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157
42	SIZE (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 514	25	SIZE (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 514
43	SHA256 (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = ad217f952ddd714c2b6b9e5924bfaf9e3b0429ba46d1db117ca1c4918aed9741	26	SHA256 (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = ad217f952ddd714c2b6b9e5924bfaf9e3b0429ba46d1db117ca1c4918aed9741
44	SIZE (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = 534	27	SIZE (festival/patch-speech__tools_include_unix_EST__socket__unix.h) = 534
45	SHA256 (festival/patch-speech__tools_stats_dynamic__program.cc) = 0c3fbe07a256be395e28d08e367e80b53d56885825ff29a232793c8e03915141
46	SIZE (festival/patch-speech__tools_stats_dynamic__program.cc) = 1106
47	SHA256 (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 5edb267faa21adf31b5503cf5db4e55d4ad2c3eaecf1550d7df1ef8cb94c448c
48	SIZE (festival/patch-speech__tools_utils_EST__ServiceTable.cc) = 649

Lines 1-12 Link Here

(-)audio/festival/files/patch-festival_config_modules_nas_audio.mak (-12 lines)
1	$NetBSD: patch-ah,v 1.1 2000/05/05 20:54:57 hubertf Exp $
2
3	--- festival/config/modules/nas_audio.mak.orig Fri May 5 21:07:15 2000
4	+++ festival/config/modules/nas_audio.mak Fri May 5 21:07:29 2000
5	@@ -44,6 +44,6 @@
6
7	AUDIO_DEFINES += -DSUPPORT_NAS
8	AUDIO_INCLUDES += -I$(NAS_INCLUDE)
9	-MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -lX11 -lXt
10	+MODULE_LIBS += -L$(NAS_LIB) -laudio -L$(X11_LIB) -Wl,-R$(X11_LIB) -lX11 -lXt
11
12

Line 0 Link Here

(-)audio/festival/files/patch-festival_src_modules_MultiSyn_TargetCostRescoring.cc (+23 lines)
	1	Part of Debian's patch at:
	2	http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff
	3
	4	--- festival/src/modules/MultiSyn/TargetCostRescoring.cc.orig 2017-09-04 15:54:08 UTC
	5	+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc
	6	@@ -82,7 +82,7 @@ void rescoreCandidates( EST_VTCandidate
	7	//cerr << scores << endl;
	8
	9	// calculate simple mean duration of some or all of candidates
	10	- float meandur = 0.0;
	11	+ long meandur = 0.0;
	12	int n = 0;
	13
	14	if( beam_width < 0 ){ // just average all of them
	15	@@ -107,7 +107,7 @@ void rescoreCandidates( EST_VTCandidate
	16
	17	// then tweak the scores based on that
	18	for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
	19	- float cand_dur = scores(li)._dur;
	20	+ long cand_dur = scores(li)._dur;
	21	// cerr << scores(li)._cand->score << " ";
	22	scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
	23	// cerr << scores(li)._cand->score << endl;

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 2017-09-04 15:54:08 UTC
	2	+++ festival/src/modules/hts_engine/HTS_misc.c
	3	@@ -245,11 +245,7 @@ size_t HTS_ftell(HTS_File * fp)
	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;

Lines 1-23 Link Here

(-)audio/festival/files/patch-long-over-float (-23 lines)
1	Part of Debian's patch at:
2	http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff
3
4	--- festival/src/modules/MultiSyn/TargetCostRescoring.cc 2011-02-16 10:35:34.000000000 -0600
5	+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc 2011-02-16 10:43:23.000000000 -0600
6	@@ -82,7 +82,7 @@
7	//cerr << scores << endl;
8
9	// calculate simple mean duration of some or all of candidates
10	- float meandur = 0.0;
11	+ long meandur = 0.0;
12	int n = 0;
13
14	if( beam_width < 0 ){ // just average all of them
15	@@ -107,7 +107,7 @@
16
17	// then tweak the scores based on that
18	for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
19	- float cand_dur = scores(li)._dur;
20	+ long cand_dur = scores(li)._dur;
21	// cerr << scores(li)._cand->score << " ";
22	scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
23	// cerr << scores(li)._cand->score << endl;

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_config_modules_nas__audio.mak (+12 lines)
	1	$NetBSD: patch-ag,v 1.1 2000/05/05 20:54:57 hubertf Exp $
	2
	3	--- speech_tools/config/modules/nas_audio.mak.orig 2017-09-04 15:54:03 UTC
	4	+++ speech_tools/config/modules/nas_audio.mak
	5	@@ -45,6 +45,6 @@ MOD_DESC_NAS_AUDIO=Use Network Audio
	6	AUDIO_DEFINES += -DSUPPORT_NAS
	7	AUDIO_INCLUDES += -I$(NAS_INCLUDE)
	8	MODULE_LIBS += -L$(NAS_LIB) -laudio
	9	-MODULE_EXTRA_LIBS += -L$(X11_LIB) -lX11 -lXt
	10	+MODULE_EXTRA_LIBS += -L$(X11_LIB) -Wl,-R $(X11_LIB) -lX11 -lXt
	11
	12

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_config_rules_install.mak (+13 lines)
	1	author: Tod McQuillin
	2
	3	--- speech_tools/config/rules/install.mak.orig 2017-09-04 15:54:03 UTC
	4	+++ speech_tools/config/rules/install.mak
	5	@@ -39,7 +39,7 @@
	6
	7
	8
	9	-PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd)
	10	+PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME)
	11
	12	PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd))
	13

Line 0 Link Here

(-)audio/festival/files/patch-speech__tools_include_EST__unix.h (+12 lines)
	1	$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $
	2
	3	--- speech_tools/include/EST_unix.h.orig 2017-09-04 15:54:03 UTC
	4	+++ speech_tools/include/EST_unix.h
	5	@@ -53,6 +53,7 @@
	6	# include <sys/wait.h>
	7	# include <sys/resource.h>
	8	# include <dirent.h>
	9	+# define unix 1
	10	#elif defined(SYSTEM_IS_WIN32)
	11	# include <io.h>
	12	# include "win32/EST_unix_win32.h"

Lines 2-15 Link Here

(-)audio/festival/files/patch-speech__tools_main_sig2fv__main.cc (-3 / +3 lines)
2	" default: "DEFAULT_WINDOW"\n\n"	2	" default: "DEFAULT_WINDOW"\n\n"
3	^	3	^
4		4
5	--- speech_tools/main/sig2fv_main.cc.orig 2010-11-05 14:12:43 UTC	5	--- speech_tools/main/sig2fv_main.cc.orig 2017-09-04 15:54:03 UTC
6	+++ speech_tools/main/sig2fv_main.cc	6	+++ speech_tools/main/sig2fv_main.cc
7	@@ -187,7 +187,7 @@ int main(int argc, char *argv[])	7	@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
8	"-window_type <string> Type of window used on waveform. \n"	8	"-window_type <string> Type of window used on waveform. \n"
9	" Permissable types are: \n" +	9	" Permissable types are: \n" +
10	EST_Window::options_supported() +	10	EST_Window::options_supported() +
11	- " default: "DEFAULT_WINDOW"\n\n"	11	- " default: \"DEFAULT_WINDOW\"\n\n"
12	+ " default: " DEFAULT_WINDOW "\n\n"	12	+ " default: \" DEFAULT_WINDOW\"\n\n"
13	"-lpc_order <int> Order of lpc analysis. \n\n"	13	"-lpc_order <int> Order of lpc analysis. \n\n"
14	"-ref_order <int> Order of lpc reflection coefficient analysis. \n\n"	14	"-ref_order <int> Order of lpc reflection coefficient analysis. \n\n"
15	"-cep_order <int> Order of lpc cepstral analysis.\n\n"	15	"-cep_order <int> Order of lpc cepstral analysis.\n\n"

Lines 1-12 Link Here

(-)audio/festival/files/patch-speech_tools_audio_nas.cc (-12 lines)
1	--- speech_tools/audio/nas.cc.orig Thu Oct 14 16:26:29 1999
2	+++ speech_tools/audio/nas.cc Fri Jun 16 17:24:25 2000
3	@@ -57,7 +57,8 @@
4
5	int nas_supported = TRUE;
6
7	-int endian_int = 1;
8	+extern int endian_int;
9	+int endian_int = 1;
10	#define NAS_BIG_ENDIAN (((char *)&endian_int)[0] == 0)
11
12	static void na_sync_play_cb(AuServer aud, AuEventHandlerRec handler,

Lines 1-12 Link Here

(-)audio/festival/files/patch-speech_tools_include_EST_unix.h (-12 lines)
1	$NetBSD: patch-ae,v 1.2 1999/10/11 14:13:49 proff Exp $
2
3	--- speech_tools/include/EST_unix.h Sun May 30 20:53:04 1999
4	+++ speech_tools/include/EST_unix.h Mon Oct 11 05:40:15 1999
5	@@ -53,6 +53,7 @@
6	# include <sys/wait.h>
7	# include <sys/resource.h>
8	# include <dirent.h>
9	+# define unix 1
10	#elif defined(SYSTEM_IS_WIN32)
11	# include <io.h>
12	# include "win32/EST_unix_win32.h"