[arch-commits] Commit in festival/repos (8 files)
Allan McRae
allan at archlinux.org
Sat Mar 21 09:59:19 UTC 2009
Date: Saturday, March 21, 2009 @ 05:59:19
Author: allan
Revision: 30681
Merged revisions 356,30679-30680 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/festival/trunk
........
r356 | aaron | 2008-04-19 08:56:27 +1000 (Sat, 19 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r30679 | allan | 2009-03-21 18:49:00 +1000 (Sat, 21 Mar 2009) | 1 line
add build patches, actaully install utilities rather than wrapper scripts (FS#7864), add some extra scripts (FS#9332), general PKGBUILD clean-up
........
r30680 | allan | 2009-03-21 19:58:03 +1000 (Sat, 21 Mar 2009) | 2 lines
upgpkg: festival 1.96beta-2
add an x86_64 build patch, remove out of date patches
........
Added:
festival/repos/extra-i686/festival-1.96_beta-gcc43.patch
(from rev 30680, festival/trunk/festival-1.96_beta-gcc43.patch)
festival/repos/extra-i686/speech-tools-1.2.96_beta-gcc42.patch
(from rev 30680, festival/trunk/speech-tools-1.2.96_beta-gcc42.patch)
festival/repos/extra-i686/speech-tools-1.2.96_beta-gcc43-include.patch
(from rev 30680, festival/trunk/speech-tools-1.2.96_beta-gcc43-include.patch)
Modified:
festival/repos/extra-i686/ (properties)
festival/repos/extra-i686/PKGBUILD
Deleted:
festival/repos/extra-i686/festival-1.95_beta-gcc41-amd64-int-pointer.patch
festival/repos/extra-i686/festival-1.95_beta-gcc41-amd64.patch
festival/repos/extra-i686/festival-1.95_beta-gcc41.patch
--------------------------------------------------+
PKGBUILD | 127 ++++---
festival-1.95_beta-gcc41-amd64-int-pointer.patch | 359 ---------------------
festival-1.95_beta-gcc41-amd64.patch | 11
festival-1.95_beta-gcc41.patch | 77 ----
festival-1.96_beta-gcc43.patch | 12
speech-tools-1.2.96_beta-gcc42.patch | 61 +++
speech-tools-1.2.96_beta-gcc43-include.patch | 22 +
7 files changed, 179 insertions(+), 490 deletions(-)
Property changes on: festival/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /festival/trunk:1
+ /festival/trunk:1-30680
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-03-21 09:58:03 UTC (rev 30680)
+++ extra-i686/PKGBUILD 2009-03-21 09:59:19 UTC (rev 30681)
@@ -4,61 +4,110 @@
#Contributor: Simo Leone <neotuli at gmail.com>
pkgname=festival
pkgver=1.96beta
-pkgverorig=1.96-beta
-pkgrel=1
+_pkgverorig=1.96-beta
+pkgrel=2
pkgdesc="Festival is a general multi-lingual speech synthesis system developed at CSTR (Centre for Speech Technology Research)."
-license=""
-arch=('i686')
+arch=('i686' 'x86_64')
url="http://www.cstr.ed.ac.uk/projects/festival/"
+license=('BSD' 'GPL' 'custom')
depends=('perl')
-source=("http://festvox.org/packed/festival/1.96/$pkgname-$pkgverorig.tar.gz" \
- "http://festvox.org/packed/festival/1.96/speech_tools-1.2.96-beta.tar.gz" \
- "http://festvox.org/packed/festival/1.96/festlex_POSLEX.tar.gz" \
- "http://festvox.org/packed/festival/1.96/festlex_CMU.tar.gz" \
- "http://festvox.org/packed/festival/1.96/festlex_OALD.tar.gz" \
- "config.diff" "festconfig.diff")
+options=('!makeflags')
+source=(http://festvox.org/packed/festival/1.96/$pkgname-$_pkgverorig.tar.gz
+ http://festvox.org/packed/festival/1.96/speech_tools-1.2.96-beta.tar.gz
+ http://festvox.org/packed/festival/1.96/festlex_POSLEX.tar.gz
+ http://festvox.org/packed/festival/1.96/festlex_CMU.tar.gz
+ http://festvox.org/packed/festival/1.96/festlex_OALD.tar.gz
+ config.diff
+ festconfig.diff
+ speech-tools-1.2.96_beta-gcc42.patch
+ speech-tools-1.2.96_beta-gcc43-include.patch
+ festival-1.96_beta-gcc43.patch)
+md5sums=('74915f4ffb13471c7e529ae92b392453'
+ '887e0c7586facb97cfc0114a105763b2'
+ '742c266e4c4978fae2b5c1bf6f549eb4'
+ '66d39c6f7b8e9d9beade051312365020'
+ '45a03689025849d02ec963a5b338ef37'
+ 'd57d669a1751b98359bea7cd15991e89'
+ '04a7517509d28e36023fd865f998cf86'
+ 'db6055cb7083aec48c402281a70692b3'
+ '83ea6c0cab8a5a1d4ca434a22c5e8d62'
+ '193c53b0c2a2f5b198a415537de04e78')
build() {
- export MAKEFLAGS="-j1"
-
##################################################################
#Speech Tools first
- cd $startdir/src/speech_tools
- patch -p1 < $startdir/src/config.diff
+ cd $srcdir/speech_tools
+ patch -Np1 -i $srcdir/config.diff
+ patch -Np1 -i $srcdir/speech-tools-1.2.96_beta-gcc42.patch
+ patch -Np1 -i $srcdir/speech-tools-1.2.96_beta-gcc43-include.patch
./configure --prefix=/usr --sysconfdir=/etc
make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" || return 1
- mkdir -p $startdir/pkg/usr/{bin,lib,include/speech_tools}
- cp -a bin/* $startdir/pkg/usr/bin
- cp -a lib/lib*.a lib/lib*.so* $startdir/pkg/usr/lib
- cp -aR include/* $startdir/pkg/usr/include/speech_tools
+ install -dm755 $pkgdir/usr/{bin,lib,include/speech_tools{,instantiate,ling_class,rxp,sigpr,unix}}
+
+ #binaries
+ #move binaries over wrappers (FS#7864)
+ for i in `grep -l 'EST shared script' bin/*`; do
+ cp -f main/$(basename $i) bin;
+ done
+ install -m755 -t $pkgdir/usr/bin bin/[a-z]*
+ rm -f $pkgdir/usr/bin/{est_gdb,est_examples,est_program}
- rm -rf $startdir/pkg/usr/include/speech_tools/win32
- rm -rf `find $startdir/pkg -name Makefile`
- rm -f $startdir/pkg/usr/bin/{est_gdb,est_examples,est_program}
+ #libraries
+ install -m755 -t $pkgdir/usr/lib lib/lib*.so.*
+ ln -sf libestbase.so.1.2.96.1 $pkgdir/usr/lib/libestbase.so
+ ln -sf libeststring.so.1.2 $pkgdir/usr/lib/libeststring.so
+ install -m644 -t $pkgdir/usr/lib lib/lib*.a
+
+ #headers
+ for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
+ install -m644 -t ../../tmp/usr/include/speech_tools/$dir include/$dir/*.h
+ done
#################################################################
# Now Festival itself
- cd $startdir/src/festival
- patch -p1 < $startdir/src/festconfig.diff
+ cd $srcdir/festival
+ patch -Np1 -i $srcdir/festconfig.diff
+ patch -Np1 -i $srcdir/festival-1.96_beta-gcc43.patch
+
+ # Aviod make failure on making scripts and docs
+ sed -i "s#examples bin doc#examples#" Makefile
+
./configure --prefix=/usr --sysconfdir=/etc
- make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" #will fail on making scripts
+ make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
- install -D -m755 src/main/festival $startdir/pkg/usr/bin/festival
- install -D -m755 src/main/festival_client $startdir/pkg/usr/bin/festival_client
- install -D -m644 src/lib/libFestival.a $startdir/pkg/usr/lib/libFestival.a
- mkdir -p $startdir/pkg/usr/include/festival
- cp -aR src/include/* $startdir/pkg/usr/include/festival
- rm -f $startdir/pkg/usr/include/festival/Makefile
- mkdir -p $startdir/pkg/usr/share/festival
- cp -aR lib/* $startdir/pkg/usr/share/festival
- rm -f `find $startdir/pkg/usr/share/festival -name Makefile`
- mkdir -p $startdir/pkg/usr/share/festival/voices
+ #binaries
+ install -m755 src/main/festival $pkgdir/usr/bin/
+ install -m755 src/main/festival_client $pkgdir/usr/bin/
+ install -m755 examples/text2wave $pkgdir/usr/bin
+ install -m755 examples/saytime $pkgdir/usr/bin/
+ #libraries
+ install -m644 src/lib/libFestival.a $pkgdir/usr/lib/
+
+ #headers
+ install -Dm755 $pkgdir/usr/include/festival
+ install -m644 -t $pkgdir/usr/include/festival src/include/*.h
+
+ mkdir -p $pkgdir/usr/share/festival
+ #install -m644 -t $pkgdir/usr/share/festival lib/*.scm
+ #need to clean up but requires knowing which files are actually needed...
+ cp -aR lib/* $pkgdir/usr/share/festival
+ rm -f $(find $pkgdir/usr/share/festival -name Makefile)
+
+ #create voices directory
+ install -Dm755 $pkgdir/usr/share/festival/voices
+
+ #licenses
+ install -D -m644 $srcdir/festival/COPYING \
+ $pkgdir/usr/share/licenses/$pkgname/COPYING
+ install -D -m644 $srcdir/speech_tools/README \
+ $pkgdir/usr/share/licenses/$pkgname/COPYING.other
+
#################################################################
# Ok now some general cleanups
- for i in `find $startdir/pkg/usr/include/ -type f`; do
+ for i in `find $pkgdir/usr/include/ -type f`; do
sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \
-e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \
@@ -70,12 +119,4 @@
-e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \
-e 's,"Phone\.h",\<festival/Phone.h\>,g' $i
done
- rm -rf `find $startdir/pkg -name Makefile`
}
-md5sums=('74915f4ffb13471c7e529ae92b392453'
- '887e0c7586facb97cfc0114a105763b2'
- '742c266e4c4978fae2b5c1bf6f549eb4'
- '66d39c6f7b8e9d9beade051312365020'
- '45a03689025849d02ec963a5b338ef37'
- 'd57d669a1751b98359bea7cd15991e89'
- '04a7517509d28e36023fd865f998cf86')
Deleted: extra-i686/festival-1.95_beta-gcc41-amd64-int-pointer.patch
===================================================================
--- extra-i686/festival-1.95_beta-gcc41-amd64-int-pointer.patch 2009-03-21 09:58:03 UTC (rev 30680)
+++ extra-i686/festival-1.95_beta-gcc41-amd64-int-pointer.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -1,359 +0,0 @@
---- speech_tools/include/EST_simplestats.h 2006/07/21 02:18:39 1.1
-+++ speech_tools/include/EST_simplestats.h 2006/07/21 02:35:43
-@@ -194,7 +194,7 @@ enum EST_tprob_type {tprob_string, tprob
- for example
- \begin{verbatim}
- EST_DiscreteProbistribution pdf;
-- for (int i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
-+ for (long i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
- {
- EST_String name;
- double prob;
-@@ -265,17 +265,17 @@ public:
- ///
- double frequency(const int i) const;
- /// Used for iterating through members of the distribution
-- int item_start() const;
-+ long item_start() const;
- /// Used for iterating through members of the distribution
-- int item_next(int idx) const;
-+ long item_next(long idx) const;
- /// Used for iterating through members of the distribution
-- int item_end(int idx) const;
-+ int item_end(long idx) const;
- /// During iteration returns name given index
-- const EST_String &item_name(int idx) const;
-+ const EST_String &item_name(long idx) const;
- /// During iteration returns name and frequency given index
-- void item_freq(int idx,EST_String &s,double &freq) const;
-+ void item_freq(long idx,EST_String &s,double &freq) const;
- /// During iteration returns name and probability given index
-- void item_prob(int idx,EST_String &s,double &prob) const;
-+ void item_prob(long idx,EST_String &s,double &prob) const;
-
- /// Returns discrete vocabulary of distribution
- inline const EST_Discrete *const get_discrete() const { return discrete; };
---- speech_tools/stats/wagon/wagon_aux.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/stats/wagon/wagon_aux.cc 2006/07/21 02:36:09
-@@ -537,7 +537,7 @@ ostream & operator <<(ostream &s, WImpur
- }
- else if (imp.t == wnim_class)
- {
-- int i;
-+ long i;
- EST_String name;
- double prob;
-
---- speech_tools/stats/EST_DProbDist.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/stats/EST_DProbDist.cc 2006/07/21 02:41:32
-@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::ent
- }
-
- // For iterating through members of a probability distribution
--int EST_DiscreteProbDistribution::item_start(void) const
-+long EST_DiscreteProbDistribution::item_start(void) const
- {
- if (type == tprob_discrete)
- return 0;
- else
-- return (int)scounts.list.head();
-+ return (long)scounts.list.head();
- }
-
--int EST_DiscreteProbDistribution::item_end(int idx) const
-+int EST_DiscreteProbDistribution::item_end(long idx) const
- {
- if (type == tprob_discrete)
- return (idx >= icounts.length());
-@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_e
- return ((EST_Litem *)idx == 0);
- }
-
--int EST_DiscreteProbDistribution::item_next(int idx) const
-+long EST_DiscreteProbDistribution::item_next(long idx) const
- {
- if (type == tprob_discrete)
- return ++idx;
- else
-- return (int)next((EST_Litem *)idx);
-+ return (long)next((EST_Litem *)idx);
- }
-
--const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
-+const EST_String &EST_DiscreteProbDistribution::item_name(long idx) const
- {
- if (type == tprob_discrete)
- return discrete->name(idx);
-@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistri
- return scounts.list((EST_Litem *)idx).k;
- }
-
--void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
-+void EST_DiscreteProbDistribution::item_freq(long idx,EST_String &s,double &freq) const
- {
- if (type == tprob_discrete)
- {
-@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_
- }
- }
-
--void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
-+void EST_DiscreteProbDistribution::item_prob(long idx,EST_String &s,double &prob) const
- {
- if (type == tprob_discrete)
- {
-@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_
- ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
- {
- // Output best with probabilities
-- int i;
-+ long i;
- double prob;
- double sum=0;
- EST_String name;
---- speech_tools/grammar/ngram/EST_Ngrammar.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/ngram/EST_Ngrammar.cc 2006/07/21 02:38:54
-@@ -180,7 +180,7 @@ bool EST_BackoffNgrammarState::accumulat
- const double count)
- {
-
--// int i;
-+// long i;
- // cerr << "accumulate level " << p_level << " : ";
- // for(i=0;i<words.n();i++)
- // {
-@@ -302,7 +302,7 @@ void EST_BackoffNgrammarState::print_fre
- // not right - just print out, then recurse through children
- // change to use 'backoff_traverse'
-
-- int k;
-+ long k;
- double freq;
- EST_String name;
- for (k=p_pdf.item_start();
-@@ -369,7 +369,7 @@ void EST_BackoffNgrammarState::zap()
- {
-
- // recursively delete this state and all its children
-- int k;
-+ long k;
- double freq;
- EST_String name;
- for (k=p_pdf.item_start();
-@@ -452,7 +452,7 @@ bool EST_BackoffNgrammarState::set_backo
-
- void EST_BackoffNgrammarState::frequency_of_frequencies(EST_DVector &ff)
- {
-- int k,max=ff.n();
-+ long k; int max=ff.n();
- double freq;
- EST_String name;
- for (k=p_pdf.item_start();
-@@ -911,7 +911,7 @@ void EST_Ngrammar::accumulate(const EST_
- {
-
- /*
-- int i;
-+ long i;
- for(i=0;i<words.n();i++)
- {
- cerr << vocab_pdf.item_name(words(i));
-@@ -1581,7 +1581,7 @@ void EST_Ngrammar::prune_backoff_represe
- // remove any branches with zero frequency count
-
- // find children of this state with zero freq and zap them
-- int k;
-+ long k;
- double freq;
- EST_String name;
- for (k=start_state->pdf_const().item_start();
-@@ -2320,7 +2320,7 @@ void EST_Ngrammar::print_freqs(ostream &
- backoff_representation->print_freqs(os,p_order);
- else
- {
-- int i,j,k;
-+ int i,j; long k;
- EST_IVector window(p_order-1);
-
- for (i=0; i < p_num_states; i++)
-@@ -2661,7 +2661,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
- function(start_state,params);
-
- // and recurse down the tree
-- int k;
-+ long k;
- double freq;
- EST_String name;
- for (k=start_state->pdf_const().item_start();
-@@ -2692,7 +2692,7 @@ EST_Ngrammar::backoff_traverse(EST_Backo
- {
- // and recurse down the tree if we haven't
- // reached the level yet
-- int k;
-+ long k;
- double freq;
- EST_String name;
-
---- speech_tools/grammar/ngram/ngrammar_io.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/ngram/ngrammar_io.cc 2006/07/21 02:39:05
-@@ -281,7 +281,7 @@ EST_read_status
- load_ngram_cstr_bin(const EST_String filename, EST_Ngrammar &n)
- {
- EST_TokenStream ts;
-- int i,j,k,order;
-+ int i,j,order; long k;
- int num_entries;
- double approx_num_samples = 0.0;
- long freq_data_start, freq_data_end;
-@@ -407,7 +407,7 @@ EST_write_status
- save_ngram_htk_ascii_sub(const EST_String &word, ostream *ost,
- EST_Ngrammar &n, double floor)
- {
-- int k;
-+ long k;
- EST_String name;
- double freq;
- EST_StrVector this_ngram(2); // assumes bigram
-@@ -734,7 +734,7 @@ save_ngram_cstr_ascii(const EST_String f
- // awb's format
- (void)trace;
- ostream *ost;
-- int i,k;
-+ int i; long k;
-
- if (filename == "-")
- ost = &cout;
-@@ -831,7 +831,7 @@ save_ngram_cstr_bin(const EST_String fil
- if (n.representation() == EST_Ngrammar::sparse)
- return misc_write_error;
-
-- int i,k;
-+ int i; long k;
- FILE *ofd;
- double lfreq = -1;
- double count = -1;
---- speech_tools/grammar/ngram/ngrammar_aux.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/ngram/ngrammar_aux.cc 2006/07/21 02:39:20
-@@ -117,7 +117,7 @@ smooth_ExponentialFit(EST_DVector &N, in
-
- void make_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
-- int k;
-+ long k;
- double freq;
- EST_String name;
-
-@@ -138,7 +138,7 @@ void make_f_of_f(EST_BackoffNgrammarStat
-
- void get_max_f(EST_BackoffNgrammarState *s,void *params)
- {
-- int k;
-+ long k;
- double freq;
- EST_String name;
-
-@@ -158,7 +158,7 @@ void get_max_f(EST_BackoffNgrammarState
-
- void map_f_of_f(EST_BackoffNgrammarState *s,void *params)
- {
-- int k;
-+ long k;
- double freq;
- EST_String name;
-
-@@ -184,7 +184,7 @@ void map_f_of_f(EST_BackoffNgrammarState
-
- void zero_small_f(EST_BackoffNgrammarState *s,void *params)
- {
-- int k;
-+ long k;
- double freq;
- EST_String name;
-
-@@ -204,7 +204,7 @@ void zero_small_f(EST_BackoffNgrammarSta
-
- void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order)
- {
-- int i,k,size;
-+ int i,size; long k;
- double max=0.0;
-
- // if ff has zero size, do complete frequency of frequencies
-@@ -302,7 +302,7 @@ void frequency_of_frequencies(EST_DVecto
-
- void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order)
- {
-- int i,k;
-+ int i; long k;
-
-
- switch(n.representation())
---- speech_tools/grammar/ngram/EST_PST.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/ngram/EST_PST.cc 2006/07/21 02:39:31
-@@ -71,7 +71,7 @@ EST_PredictionSuffixTree_tree_node::prin
- // Base -- print from pd
- EST_String s;
- double freq;
-- for (int i = pd.item_start();
-+ for (long i = pd.item_start();
- !pd.item_end(i);
- i=pd.item_next(i))
- {
-@@ -98,7 +98,7 @@ EST_PredictionSuffixTree_tree_node::prin
- EST_String s;
- double prob;
- os << get_path() << " :";
-- for (int i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
-+ for (long i = pd.item_start(); !pd.item_end(i) ; i=pd.item_next(i))
- {
- pd.item_prob(i,s,prob);
- os << " " << s << " " << prob;
---- speech_tools/grammar/ngram/freqsmooth.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/ngram/freqsmooth.cc 2006/07/21 02:46:42
-@@ -74,7 +74,7 @@ void fs_build_backoff_ngrams(EST_Ngramma
- EST_Ngrammar &ngram)
- {
- // Build all the backoff grammars back to uni-grams
-- int i,j,k,l;
-+ int i,j,l; long k;
-
- for (i=0; i < ngram.order()-1; i++)
- backoff_ngrams[i].init(i+1,EST_Ngrammar::dense,
-@@ -110,7 +110,7 @@ int fs_backoff_smooth(EST_Ngrammar *back
- {
- // For all ngrams which are too infrequent, adjust their
- // frequencies based on their backoff probabilities
-- int i,j;
-+ int i; long j;
- double occurs;
- double backoff_prob;
-
---- speech_tools/grammar/wfst/wfst_train.cc 2006/07/21 02:18:39 1.1
-+++ speech_tools/grammar/wfst/wfst_train.cc 2006/07/21 02:39:47
-@@ -299,7 +299,7 @@ static LISP find_best_split(EST_WFST &wf
- LISP *ssplits;
- gc_protect(&splits);
- EST_String sname;
-- int b,best_b,i;
-+ int b,best_b; long i;
- int num_pdfs;
- double best_score, score, sfreq;
-
-@@ -374,7 +374,7 @@ static double score_pdf_combine(EST_Disc
- // Find score of (a+b) vs (all-(a+b))
- EST_DiscreteProbDistribution ab(a);
- EST_DiscreteProbDistribution all_but_ab(all);
-- int i;
-+ long i;
- EST_String sname;
- double sfreq, score;
- for (i=b.item_start(); !b.item_end(i);
-@@ -506,7 +506,7 @@ static double find_score_if_split(EST_WF
- EST_DiscreteProbDistribution pdf_split(&wfst.in_symbols());
- EST_DiscreteProbDistribution pdf_remain(&wfst.in_symbols());
- int in, tostate, id;
-- int i;
-+ long i;
- double sfreq;
- EST_String sname;
-
Deleted: extra-i686/festival-1.95_beta-gcc41-amd64.patch
===================================================================
--- extra-i686/festival-1.95_beta-gcc41-amd64.patch 2009-03-21 09:58:03 UTC (rev 30680)
+++ extra-i686/festival-1.95_beta-gcc41-amd64.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -1,11 +0,0 @@
---- speech_tools/ling_class/item_feats.cc 2006/06/27 11:43:49 1.1
-+++ speech_tools/ling_class/item_feats.cc 2006/06/27 11:44:25
-@@ -78,7 +78,7 @@ EST_String get_featname(const EST_Item_f
- EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
-
- if (!found)
-- EST_error("featfunc 0x%x has no name", (int)func);
-+ EST_error("featfunc 0x%p has no name", func);
-
- return name;
- }
Deleted: extra-i686/festival-1.95_beta-gcc41.patch
===================================================================
--- extra-i686/festival-1.95_beta-gcc41.patch 2009-03-21 09:58:03 UTC (rev 30680)
+++ extra-i686/festival-1.95_beta-gcc41.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -1,77 +0,0 @@
---- speech_tools/include/EST_Chunk.h 2006/06/05 00:32:45 1.1
-+++ speech_tools/include/EST_Chunk.h 2006/06/05 01:41:28
-@@ -103,6 +103,8 @@
- /* */
- /************************************************************************/
-
-+class EST_ChunkPtr;
-+
- class EST_Chunk {
- public:
- typedef unsigned short use_counter;
-@@ -152,6 +154,13 @@ class EST_Chunk {
- /* */
- /************************************************************************/
-
-+EST_ChunkPtr chunk_allocate(int bytes);
-+EST_ChunkPtr chunk_allocate(int bytes, const char *initial, int initial_len);
-+EST_ChunkPtr chunk_allocate(int bytes, const EST_ChunkPtr &initial, int initial_start, int initial_len);
-+
-+void make_updatable(EST_ChunkPtr &shared, EST_Chunk::EST_chunk_size inuse);
-+void make_updatable(EST_ChunkPtr &shared);
-+
- class EST_ChunkPtr {
- private:
- EST_Chunk *ptr;
---- speech_tools/include/ling_class/EST_Item.h 2006/06/05 00:39:43 1.1
-+++ speech_tools/include/ling_class/EST_Item.h 2006/06/05 00:40:02
-@@ -79,6 +79,9 @@ use we envisage. Traversal of the items
-
- */
-
-+class EST_Item;
-+int same_item(const EST_Item *l1,const EST_Item *l2);
-+
- class EST_Item
- {
- private:
---- ./speech_tools/base_class/EST_Pathname_unix.cc 2006/06/05 00:59:34 1.1
-+++ ./speech_tools/base_class/EST_Pathname_unix.cc 2006/06/05 01:19:16
-@@ -89,7 +89,7 @@ EST_Pathname EST_Pathname::as_directory(
- return *this;
-
- if (length() > 0)
-- return ::operator +(EST_String(*this), "/");
-+ return EST_String(*this) + "/";
-
- return "./";
- }
---- festival/src/modules/clunits/clunits.h 2006/06/05 01:58:30 1.1
-+++ festival/src/modules/clunits/clunits.h 2006/06/05 01:58:47
-@@ -83,9 +83,9 @@ class CLDB {
- CLfile *get_fileitem(const EST_String &name)
- { return (CLfile *)fileindex.lookup(name); }
- void load_coefs_sig(EST_Item *unit);
-- CLfile *CLDB::get_file_coefs_sig(const EST_String &fileid);
-+ CLfile *get_file_coefs_sig(const EST_String &fileid);
- void load_join_coefs(CLunit *unit);
-- CLfile *CLDB::get_file_join_coefs(const EST_String &fileid);
-+ CLfile *get_file_join_coefs(const EST_String &fileid);
- };
-
-
---- festival/src/modules/MultiSyn/EST_JoinCostCache.h 2006/06/05 02:00:28 1.1
-+++ festival/src/modules/MultiSyn/EST_JoinCostCache.h 2006/06/05 02:00:57
-@@ -56,11 +56,11 @@
- /** Object oriented approach for better and for worse...
- */
-
-+#include <ostream>
- #include "EST_TList.h"
- #include "ling_class/EST_Item.h"
-
- class EST_JoinCost;
--class ostream;
-
- class EST_JoinCostCache {
- public:
Copied: festival/repos/extra-i686/festival-1.96_beta-gcc43.patch (from rev 30680, festival/trunk/festival-1.96_beta-gcc43.patch)
===================================================================
--- extra-i686/festival-1.96_beta-gcc43.patch (rev 0)
+++ extra-i686/festival-1.96_beta-gcc43.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -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;
Copied: festival/repos/extra-i686/speech-tools-1.2.96_beta-gcc42.patch (from rev 30680, festival/trunk/speech-tools-1.2.96_beta-gcc42.patch)
===================================================================
--- extra-i686/speech-tools-1.2.96_beta-gcc42.patch (rev 0)
+++ extra-i686/speech-tools-1.2.96_beta-gcc42.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -0,0 +1,61 @@
+--- speech_tools/config/compilers/egcs.mak 2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/config/compilers/egcs.mak 2007-08-28 23:08:01.000000000 +0200
+@@ -54,7 +54,7 @@
+ CXX=$(EGCS_CXX)
+
+ ifndef EGCS_MAKE_SHARED_LIB
+- MAKE_SHARED_LIB = gcc -shared -fno-shared-data -o XXX -Xlinker -h -Xlinker XXX
++ MAKE_SHARED_LIB = gcc -shared -o XXX -Xlinker -h -Xlinker XXX
+ else
+ MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+--- speech_tools/config/compilers/gcc_defaults.mak 2006-08-05 17:37:59.000000000 +0200
++++ speech_tools/config/compilers/gcc_defaults.mak 2007-08-28 23:08:30.000000000 +0200
+@@ -76,12 +76,12 @@
+ PROFILE_gprof_CXXFLAGS = -pg
+ PROFILE_gprof_LINKFLAGS = -pg
+
+-SHARED_CCFLAGS = -fPIC -fno-shared-data
+-SHARED_CXXFLAGS = -fPIC -fno-shared-data
+-SHARED_LINKFLAGS = -fno-shared-data
++SHARED_CCFLAGS = -fPIC
++SHARED_CXXFLAGS = -fPIC
++SHARED_LINKFLAGS =
+
+ ifndef GCC_MAKE_SHARED_LIB
+- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX
+ else
+ MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+--- speech_tools/doc/estjavaapp.sgml 2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/doc/estjavaapp.sgml 2007-08-28 23:08:43.000000000 +0200
+@@ -105,7 +105,7 @@
+ &shellprompt; <userinput>cd tmpdir</userinput>
+ &shellprompt; <userinput>ar x ../libgcc.a</userinput>
+ &shellprompt; <userinput>cd ..</userinput>
+- &shellprompt; <userinput>gcc -shared -fno-shared-data -o libgcc.so.2.7.2 tmpdir/*.o</userinput>
++ &shellprompt; <userinput>gcc -shared -o libgcc.so.2.7.2 tmpdir/*.o</userinput>
+ </screen>
+ </para>
+ </sect1>
+--- speech_tools/stats/EST_DProbDist.cc 2004-09-30 14:53:36.000000000 +0200
++++ speech_tools/stats/EST_DProbDist.cc 2007-08-28 23:21:17.000000000 +0200
+@@ -310,7 +310,7 @@
+ if (type == tprob_discrete)
+ return 0;
+ else
+- return (int)scounts.list.head();
++ return (long)scounts.list.head();
+ }
+
+ int EST_DiscreteProbDistribution::item_end(int idx) const
+@@ -326,7 +326,7 @@
+ if (type == tprob_discrete)
+ return ++idx;
+ else
+- return (int)next((EST_Litem *)idx);
++ return (long)next((EST_Litem *)idx);
+ }
+
+ const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
Copied: festival/repos/extra-i686/speech-tools-1.2.96_beta-gcc43-include.patch (from rev 30680, festival/trunk/speech-tools-1.2.96_beta-gcc43-include.patch)
===================================================================
--- extra-i686/speech-tools-1.2.96_beta-gcc43-include.patch (rev 0)
+++ extra-i686/speech-tools-1.2.96_beta-gcc43-include.patch 2009-03-21 09:59:19 UTC (rev 30681)
@@ -0,0 +1,22 @@
+diff -Naur speech_tools-orig/base_class/EST_TSimpleMatrix.cc speech_tools/base_class/EST_TSimpleMatrix.cc
+--- speech_tools-orig/base_class/EST_TSimpleMatrix.cc 2004-09-30 06:53:35.000000000 -0600
++++ speech_tools/base_class/EST_TSimpleMatrix.cc 2008-01-05 11:00:07.000000000 -0600
+@@ -42,6 +42,7 @@
+
+ #include "EST_TSimpleMatrix.h"
+ #include "EST_TVector.h"
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
+ #include "EST_cutils.h"
+diff -Naur speech_tools-orig/base_class/EST_TSimpleVector.cc speech_tools/base_class/EST_TSimpleVector.cc
+--- speech_tools-orig/base_class/EST_TSimpleVector.cc 2006-07-06 06:57:18.000000000 -0600
++++ speech_tools/base_class/EST_TSimpleVector.cc 2008-01-05 11:00:32.000000000 -0600
+@@ -42,6 +42,7 @@
+
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
++#include <cstring>
+ #include <fstream>
+ #include "EST_cutils.h"
+
More information about the arch-commits
mailing list