View | Details | Raw Unified | Return to bug 228521 | Differences between
and this patch

Collapse All | Expand All

(-)audio/festival/Makefile (-2 / +3 lines)
Lines 2-12 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	festival
4
PORTNAME=	festival
5
PORTVERSION=	2.4
5
PORTVERSION=	2.5
6
DISTVERSION=	2.5.0
6
CATEGORIES=	audio accessibility
7
CATEGORIES=	audio accessibility
7
MASTER_SITES=	FESTIVAL
8
MASTER_SITES=	FESTIVAL
8
DISTFILES=	${DISTNAME}-release.tar.gz	\
9
DISTFILES=	${DISTNAME}-release.tar.gz	\
9
		speech_tools-${PORTVERSION}-release.tar.gz
10
		speech_tools-${DISTVERSION}-release.tar.gz
10
DIST_SUBDIR=	festival
11
DIST_SUBDIR=	festival
11
12
12
PATCHFILES=	src_modules_diphone_diphone.h.diff?id=b58a836:debian	\
13
PATCHFILES=	src_modules_diphone_diphone.h.diff?id=b58a836:debian	\
(-)audio/festival/distinfo (-26 / +5 lines)
Lines 1-7 Link Here
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
(-)audio/festival/files/patch-festival_config_modules_nas_audio.mak (-12 lines)
Lines 1-12 Link Here
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
 
(-)audio/festival/files/patch-long-over-float (-15 / +15 lines)
Lines 1-23 Link Here
1
Part of Debian's patch at:
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
2
	http://patch-tracker.debian.org/patch/series/view/festival/1:2.1~release-5.1/src_modules_MultiSyn_path_fixes.diff
3
3
4
--- festival/src/modules/MultiSyn/TargetCostRescoring.cc	2011-02-16 10:35:34.000000000 -0600
4
--- festival/src/modules/MultiSyn/TargetCostRescoring.cc.orig	2018-05-24 18:30:26.121817000 +0200
5
+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc	2011-02-16 10:43:23.000000000 -0600
5
+++ festival/src/modules/MultiSyn/TargetCostRescoring.cc	2018-05-24 18:30:49.368615000 +0200
6
@@ -82,7 +82,7 @@
6
@@ -82,7 +82,7 @@
7
   //cerr << scores << endl;
7
     //cerr << scores << endl;
8
   
8
   
9
   // calculate simple mean duration of some or all of candidates
9
     // calculate simple mean duration of some or all of candidates
10
-  float meandur = 0.0;
10
-    float meandur = 0.0;
11
+  long meandur = 0.0;
11
+    long meandur = 0.0;
12
   int n = 0;
12
     int n = 0;
13
 
13
 
14
   if( beam_width < 0 ){ // just average all of them
14
     if( beam_width < 0 ){ // just average all of them
15
@@ -107,7 +107,7 @@
15
@@ -107,7 +107,7 @@
16
 
16
 
17
   // then tweak the scores based on that
17
     // then tweak the scores based on that
18
   for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
18
     for( EST_Litem *li = scores.head(); li != 0; li = li->next() ){
19
-    float cand_dur = scores(li)._dur; 
19
-        float cand_dur = scores(li)._dur; 
20
+    long cand_dur = scores(li)._dur;
20
+        long cand_dur = scores(li)._dur; 
21
     //    cerr << scores(li)._cand->score << " ";
21
         //    cerr << scores(li)._cand->score << " ";
22
     scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
22
         scores(li)._cand->score += (mult * abs( cand_dur - meandur ) );
23
     //    cerr << scores(li)._cand->score << endl;
23
         //    cerr << scores(li)._cand->score << endl;
(-)audio/festival/files/patch-speech__tools_main_sig2fv__main.cc (-5 / +5 lines)
Lines 2-15 Link Here
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	2018-05-24 18:32:40.945210000 +0200
6
+++ speech_tools/main/sig2fv_main.cc
6
+++ speech_tools/main/sig2fv_main.cc	2018-05-24 18:34:16.966182000 +0200
7
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
7
@@ -187,7 +187,7 @@
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"

Return to bug 228521