[arch-commits] Commit in festival/trunk (3 files)
Allan McRae
allan at archlinux.org
Sat Mar 21 08:49:00 UTC 2009
Date: Saturday, March 21, 2009 @ 04:49:00
Author: allan
Revision: 30679
add build patches, actaully install utilities rather than wrapper scripts (FS#7864), add some extra scripts (FS#9332), general PKGBUILD clean-up
Added:
festival/trunk/festival-1.96_beta-gcc43.patch
festival/trunk/speech-tools-1.2.96_beta-gcc43-include.patch
Modified:
festival/trunk/PKGBUILD
----------------------------------------------+
PKGBUILD | 127 ++++++++++++++++---------
festival-1.96_beta-gcc43.patch | 12 ++
speech-tools-1.2.96_beta-gcc43-include.patch | 22 ++++
3 files changed, 118 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-21 08:29:53 UTC (rev 30678)
+++ PKGBUILD 2009-03-21 08:49:00 UTC (rev 30679)
@@ -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-gcc43-include.patch
+ festival-1.96_beta-gcc43.patch
+ sp-iter.diff)
+md5sums=('74915f4ffb13471c7e529ae92b392453'
+ '887e0c7586facb97cfc0114a105763b2'
+ '742c266e4c4978fae2b5c1bf6f549eb4'
+ '66d39c6f7b8e9d9beade051312365020'
+ '45a03689025849d02ec963a5b338ef37'
+ 'd57d669a1751b98359bea7cd15991e89'
+ '04a7517509d28e36023fd865f998cf86'
+ '83ea6c0cab8a5a1d4ca434a22c5e8d62'
+ '193c53b0c2a2f5b198a415537de04e78'
+ 'bdc12eaa5f44119539d2918b4ac9bb37')
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/sp-iter.diff
+ 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')
Added: festival-1.96_beta-gcc43.patch
===================================================================
--- festival-1.96_beta-gcc43.patch (rev 0)
+++ festival-1.96_beta-gcc43.patch 2009-03-21 08:49:00 UTC (rev 30679)
@@ -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;
Added: speech-tools-1.2.96_beta-gcc43-include.patch
===================================================================
--- speech-tools-1.2.96_beta-gcc43-include.patch (rev 0)
+++ speech-tools-1.2.96_beta-gcc43-include.patch 2009-03-21 08:49:00 UTC (rev 30679)
@@ -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