[Frugalware-git] frugalware-current: festival-1.96_beta-1-i686
Miklos Vajna
vmiklos at frugalware.org
Sun Mar 1 02:09:52 CET 2009
Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d7071e1fedccc4f3a5c0b144e4bade426facd33e
commit d7071e1fedccc4f3a5c0b144e4bade426facd33e
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Sun Mar 1 02:09:35 2009 +0100
festival-1.96_beta-1-i686
- sync with speech_tools
diff --git a/source/apps-extra/festival/FrugalBuild b/source/apps-extra/festival/FrugalBuild
index 2398c88..9bc3497 100644
--- a/source/apps-extra/festival/FrugalBuild
+++ b/source/apps-extra/festival/FrugalBuild
@@ -2,17 +2,17 @@
# Maintainer: Miklos Vajna <vmiklos at frugalware.org>
pkgname=festival
-pkgver=1.4.3
-pkgrel=2
+pkgver=1.96_beta
+pkgrel=1
pkgdesc="A Text to Speech engine."
url="http://www.cstr.ed.ac.uk/"
-pkgurl="http://www.speech.cs.cmu.edu/festival/cstr/festival/$pkgver"
+pkgurl="http://www.festvox.org/packed/festival/latest/"
depends=('speech_tools')
groups=('apps-extra')
archs=('i686' 'x86_64')
-up2date="lynx -dump $pkgurl/..|grep '][0-9.]*/ '|sed -n 's/.*]\(.*\)\/ .*/\1/;$ p'"
-source=($pkgurl/$pkgname-$pkgver-release.tar.gz \
- $pkgname-$pkgver-gcc33.diff \
+up2date="Flasttar $pkgurl|sed 's/-/_/g'"
+source=($pkgurl/$pkgname-${pkgver/_/-}.tar.gz \
+ festival-1.96_beta-gcc43.patch \
server.scm \
rc.$pkgname \
README.Frugalware \
@@ -25,30 +25,30 @@ source=($pkgurl/$pkgname-$pkgver-release.tar.gz \
$pkgurl/festvox_rablpc16k.tar.gz \
$pkgurl/festvox_us1.tar.gz \
$pkgurl/festvox_us3.tar.gz)
-sha1sums=('7705b711b738426b27d1275f8443327ccd8dd8de' \
- '3ac48e62a45ed386d3b76ad58c7ad6ddab813026' \
- '7187026f176c104e3406652642b85605af8409ba' \
- '49184c95ba8b3e6cdda6d819e2b12b5bd2154f63' \
- '9e9cfb45499b605483666f19664d95ac85c8f3c2' \
- '968f0007c4cd7d92ce0a786840b6dc64628776b7' \
- '53c9470d62da9754db85b11c2c82a3dd6b5ddc71' \
- 'cb7f7a3643c1af95d82144a342397cc118605f73' \
- 'c841345bf3ad02067b38010e8a1dcb827d85c361' \
- 'ad18502ae0fd10bdc3db189fa9afa8a167eceebb' \
- '777e58d25fd499530601c514650328267fb716fb' \
- '164983d46df6a09b07a5550f4613047f94b1764a' \
- 'f740064af99670e35879352d164b7aa9f2079820' \
- '8302d0875c2872c45ff4a8ec633f9bb916a2a814')
+sha1sums=('ffb1a7f8a587cee942de7722f9b7a58e4fd0a8e2' \
+ '3dc6b811919db2f636435f9ca78a83b276f40755' \
+ '7187026f176c104e3406652642b85605af8409ba' \
+ '49184c95ba8b3e6cdda6d819e2b12b5bd2154f63' \
+ '9e9cfb45499b605483666f19664d95ac85c8f3c2' \
+ '968f0007c4cd7d92ce0a786840b6dc64628776b7' \
+ '53c9470d62da9754db85b11c2c82a3dd6b5ddc71' \
+ 'cb7f7a3643c1af95d82144a342397cc118605f73' \
+ 'c841345bf3ad02067b38010e8a1dcb827d85c361' \
+ 'ad18502ae0fd10bdc3db189fa9afa8a167eceebb' \
+ '777e58d25fd499530601c514650328267fb716fb' \
+ '164983d46df6a09b07a5550f4613047f94b1764a' \
+ 'f740064af99670e35879352d164b7aa9f2079820' \
+ '8302d0875c2872c45ff4a8ec633f9bb916a2a814')
build()
{
unset MAKEFLAGS
Fcd $pkgname
Fpatchall
- Fsed "EST=\$(TOP)/../speech_tools" "EST=/usr/share/speech-tools" \
- config/config.in
- sed -i "/^const char \*festival_libdir/s:FTLIBDIR:\"/usr/share/festival\":" src/arch/festival/festival.cc
- sed -i '/^MODULE_LIBS/s/-ltermcap/-lncurses/' \
- config/modules/editline.mak
+ # --with-system-speech-tools
+ Fsed '\(EST=\).*' '\1/usr/share/speech-tools' config/config.in
+ # --without-multisyn, broken
+ Fsed 'clunits hts_engine MultiSyn' 'clunits hts_engine' config/config.in
+
# examples path
Fsed "\.\./examples/" "/usr/share/doc/$pkgname-$pkgver/examples/" \
lib/festival.scm
diff --git a/source/apps-extra/festival/festival-1.4.3-gcc33.diff b/source/apps-extra/festival/festival-1.4.3-gcc33.diff
deleted file mode 100644
index 2cbee7d..0000000
--- a/source/apps-extra/festival/festival-1.4.3-gcc33.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur festival.org/src/modules/base/phrasify.cc festival/src/modules/base/phrasify.cc
---- festival.org/src/modules/base/phrasify.cc 2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/base/phrasify.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -218,7 +218,7 @@
- EST_Val npbreak = wagon_predict(w,phrase_type_tree);
- w->set("pbreak",npbreak.string()); // may reset to BB
- }
-- pbreak = w->f("pbreak");
-+ pbreak = (EST_String)w->f("pbreak");
- if (pbreak == "B")
- w->set("blevel",3);
- else if (pbreak == "mB")
-diff -Naur festival.org/src/modules/base/word.cc festival/src/modules/base/word.cc
---- festival.org/src/modules/base/word.cc 2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/base/word.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -64,10 +64,10 @@
- for (w=u->relation("Word")->first(); w != 0; w = next(w))
- {
- lpos = NIL;
-- pos = ffeature(w,"hg_pos");
-+ pos = (EST_String)ffeature(w,"hg_pos");
- // explicit homograph pos disambiguation
- if (pos == "0")
-- pos = ffeature(w,"pos");
-+ pos = (EST_String)ffeature(w,"pos");
- if (pos != "0")
- lpos = rintern(pos);
-
-@@ -100,8 +100,8 @@
- // from which a list can be read.
- EST_String p;
-
-- if (((p = ffeature(w,"phonemes")) != "0") ||
-- ((p = ffeature(w,"R:Token.parent.phonemes")) != "0"))
-+ if (((p = (EST_String)ffeature(w,"phonemes")) != "0") ||
-+ ((p = (EST_String)ffeature(w,"R:Token.parent.phonemes")) != "0"))
- {
- LISP phones = read_from_lstring(strintern(p));
-
-diff -Naur festival.org/src/modules/Intonation/int_tree.cc festival/src/modules/Intonation/int_tree.cc
---- festival.org/src/modules/Intonation/int_tree.cc 2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Intonation/int_tree.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -87,11 +87,11 @@
- for (s=u->relation("Syllable")->first(); s != 0; s=next(s))
- {
- if ((paccent = accent_specified(s)) == "0") // check if pre-specified
-- paccent = wagon_predict(s,accent_tree);
-+ paccent = (EST_String)wagon_predict(s,accent_tree);
- if (paccent != "NONE")
- add_IntEvent(u,s,paccent);
- if ((ptone = tone_specified(s)) == "0")
-- ptone = wagon_predict(s,endtone_tree);
-+ ptone = (EST_String)wagon_predict(s,endtone_tree);
- if (ptone != "NONE")
- add_IntEvent(u,s,ptone);
- }
-@@ -107,11 +107,11 @@
- EST_Item *token = parent(word,"Token");
- EST_String paccent("0");
- if (token)
-- paccent = ffeature(token,"accent");
-+ paccent = (EST_String)ffeature(token,"accent");
-
- if (paccent == "0")
- {
-- paccent = ffeature(word,"accent");
-+ paccent = (EST_String)ffeature(word,"accent");
- if (paccent == "0")
- return paccent;
- }
-@@ -139,11 +139,11 @@
- EST_Item *token = parent(word,"Token");
- EST_String ptone("0");
- if (token)
-- ptone = ffeature(token,"tone");
-+ ptone = (EST_String)ffeature(token,"tone");
-
- if (ptone == "0")
- {
-- ptone = ffeature(word,"tone");
-+ ptone = (EST_String)ffeature(word,"tone");
- if (ptone == "0")
- return ptone;
- }
-diff -Naur festival.org/src/modules/Text/token.cc festival/src/modules/Text/token.cc
---- festival.org/src/modules/Text/token.cc 2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Text/token.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -230,7 +230,7 @@
- else
- return cons(strintern(tok),NIL);
- }
-- else if ((token_pos = ffeature(token,"token_pos")) == "ordinal")
-+ else if ((token_pos = (EST_String)ffeature(token,"token_pos")) == "ordinal")
- return say_num_as_ordinal(tok);
- else if (token_pos == "year")
- return say_num_as_year(tok);
-@@ -404,7 +404,7 @@
- const char *tokch = tok;
-
- for (i=0; i<tok.length(); i++)
-- if (strchr(PunctuationChars,tokch[i]) == NULL)
-+ if (strchr((const char *)PunctuationChars,tokch[i]) == NULL)
- return FALSE;
-
- return TRUE;
-diff -Naur festival.org/src/modules/Text/xxml.cc festival/src/modules/Text/xxml.cc
---- festival.org/src/modules/Text/xxml.cc 2001-04-04 06:55:20.000000000 -0500
-+++ festival/src/modules/Text/xxml.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -93,7 +93,7 @@
- cerr << "xxml parse error: unexpected end of file \n";
- festival_error();
- }
-- line = ts.get_upto_eoln();
-+ line = (EST_String)ts.get_upto_eoln();
- type = line.at(0,1);
- remainder = line.after(0);
- if (type == "-")
-@@ -159,7 +159,7 @@
- EST_Token t;
-
- ts.open_string(remainder);
-- name = ts.get();
-+ name = (EST_String)ts.get();
- if ((t=ts.get()) == "IMPLIED")
- att = cons(rintern(name),cons(NIL,NIL));
- else if (t == "TOKEN")
-diff -Naur festival.org/src/modules/UniSyn_diphone/us_diphone_index.cc festival/src/modules/UniSyn_diphone/us_diphone_index.cc
---- festival.org/src/modules/UniSyn_diphone/us_diphone_index.cc 2002-07-02 06:18:30.000000000 -0500
-+++ festival/src/modules/UniSyn_diphone/us_diphone_index.cc 2003-06-22 10:41:41.000000000 -0500
-@@ -106,9 +106,9 @@
-
- if (!item)
- return "";
-- else if ((d1 = item->f(dname+"_"+dir,def)) != "0")
-+ else if ((d1 = (EST_String)item->f(dname+"_"+dir,def)) != "0")
- return d1;
-- else if ((d1 = item->f(dname,def)) != "0")
-+ else if ((d1 = (EST_String)item->f(dname,def)) != "0")
- return d1;
- else
- return item->f("name","0").string();
-
diff --git a/source/apps-extra/festival/festival-1.96_beta-gcc43.patch b/source/apps-extra/festival/festival-1.96_beta-gcc43.patch
new file mode 100644
index 0000000..d4f0120
--- /dev/null
+++ b/source/apps-extra/festival/festival-1.96_beta-gcc43.patch
@@ -0,0 +1,12 @@
+diff -Naur festival-orig/src/modules/Text/text_modes.cc festival/src/modules/Text/text_modes.cc
+--- festival-orig/src/modules/Text/text_modes.cc 2004-09-30 07:04:18.000000000 -0600
++++ festival/src/modules/Text/text_modes.cc 2008-01-07 22:32:44.000000000 -0600
+@@ -60,7 +60,7 @@
+ {
+
+ volatile EST_String tmpname = make_tmp_filename();
+- volatile EST_String inname = get_c_string(filename);
++ volatile EST_String inname(get_c_string(filename));
+ volatile EST_String filter;
+ volatile EST_TokenStream ts;
+ volatile LISP func;
More information about the Frugalware-git
mailing list