[arch-commits] Commit in festival/trunk (6 files)
Andrea Scarpino
andrea at archlinux.org
Mon May 24 15:00:51 UTC 2010
Date: Monday, May 24, 2010 @ 11:00:50
Author: andrea
Revision: 80983
upstream release
Modified:
festival/trunk/PKGBUILD
festival/trunk/config.diff
festival/trunk/festconfig.diff
Deleted:
festival/trunk/festival-1.96_beta-gcc43.patch
festival/trunk/speech-tools-1.2.96_beta-gcc42.patch
festival/trunk/speech-tools-1.2.96_beta-gcc43-include.patch
----------------------------------------------+
PKGBUILD | 91 +++++++++++--------------
config.diff | 17 +---
festconfig.diff | 13 +--
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 ------
6 files changed, 55 insertions(+), 161 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-24 15:00:34 UTC (rev 80982)
+++ PKGBUILD 2010-05-24 15:00:50 UTC (rev 80983)
@@ -1,51 +1,55 @@
# $Id$
-# vim: ft=sh ts=2 sw=2
-#Maintainer: Simo Leone <neotuli at gmail.com>
-#Contributor: Simo Leone <neotuli at gmail.com>
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Simo Leone <neotuli at gmail.com>
+
pkgname=festival
-pkgver=1.96beta
-_pkgverorig=1.96-beta
-pkgrel=2
-pkgdesc="Festival is a general multi-lingual speech synthesis system developed at CSTR (Centre for Speech Technology Research)."
+pkgver=2.0.95
+pkgrel=1
+pkgdesc="A general multi-lingual speech synthesis system developed at CSTR (Centre for Speech Technology Research)"
arch=('i686' 'x86_64')
url="http://www.cstr.ed.ac.uk/projects/festival/"
license=('BSD' 'GPL' 'custom')
depends=('perl')
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')
+source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-beta.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-beta.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
+ "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
+ 'config.diff' 'festconfig.diff')
+md5sums=('9a9fb69229839bfe913f5376f7c65e31'
+ 'b2954b7faf8bd0aa441786648cf02302'
+ '6a2ee4fed7c3ebedf197a3b8524ccb87'
+ '84af32a914d996f57bc4cb36fe8cdc97'
+ 'aa80f9250065b318325f16fdad3a4484'
+ '135cd5b093eadc92e7a03f00fff2d1aa'
+ '348cc033430aee7989463198818ae74c')
build() {
- ##################################################################
- #Speech Tools first
+ # Build Speech Tools first
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
- install -dm755 $pkgdir/usr/{bin,lib,include/speech_tools{,instantiate,ling_class,rxp,sigpr,unix}}
+ # Build Festival itself
+ cd $srcdir/festival
+ patch -Np1 -i $srcdir/festconfig.diff
+
+ # 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}"
+}
+package() {
+ # Install Speech Tools first
+ cd $srcdir/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
@@ -56,26 +60,17 @@
#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 libestbase.so.${pkgver}.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
+ install -m644 -t ${pkgdir}/usr/include/speech_tools/$dir include/$dir/*.h
done
- #################################################################
- # Now Festival itself
+ # Install Festival itself
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}"
#binaries
install -m755 src/main/festival $pkgdir/usr/bin/
@@ -87,7 +82,7 @@
install -m644 src/lib/libFestival.a $pkgdir/usr/lib/
#headers
- install -Dm755 $pkgdir/usr/include/festival
+ install -dm755 $pkgdir/usr/include/festival
install -m644 -t $pkgdir/usr/include/festival src/include/*.h
mkdir -p $pkgdir/usr/share/festival
@@ -97,13 +92,13 @@
rm -f $(find $pkgdir/usr/share/festival -name Makefile)
#create voices directory
- install -Dm755 $pkgdir/usr/share/festival/voices
+ install -dm755 $pkgdir/usr/share/festival/voices
#licenses
install -D -m644 $srcdir/festival/COPYING \
- $pkgdir/usr/share/licenses/$pkgname/COPYING
+ $pkgdir/usr/share/licenses/$pkgname/LICENSE
install -D -m644 $srcdir/speech_tools/README \
- $pkgdir/usr/share/licenses/$pkgname/COPYING.other
+ $pkgdir/usr/share/licenses/$pkgname/LICENSE.other
#################################################################
# Ok now some general cleanups
Modified: config.diff
===================================================================
--- config.diff 2010-05-24 15:00:34 UTC (rev 80982)
+++ config.diff 2010-05-24 15:00:50 UTC (rev 80983)
@@ -18,13 +18,10 @@
include $(EST)/config/systems/default.mak
-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
--JAVA=/usr/bin/java
--JAVAC=/usr/bin/javac
--JAVAH=/usr/bin/javah
-+DEFAULT_JAVA_HOME=/opt/java
-+JAVA=/opt/java/bin/java
-+JAVAC=/opt/java/bin/javac
-+JAVAH=/opt/java/bin/javah
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
TCL_LIBRARY = -ltcl
-OS_LIBS = -ldl
@@ -98,7 +95,7 @@
## Examples: gcc suncc egcs gcc28
-COMPILER=@COMPILERTYPE@
-+COMPILER=gcc32
++COMPILER=gcc
###########################################################################
## Java system to use if you include the Java interface.
@@ -126,8 +123,8 @@
# Language specific includes should be set to correct site paths
-CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/
-CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE/
-+CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.5/
-+CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.8.3/i686-linux-thread-multi/CORE/
++CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.6/
++CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/core_perl/CORE/
#OR OLD#CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.6.1/i386-linux/CORE/
##
###################################################################
Modified: festconfig.diff
===================================================================
--- festconfig.diff 2010-05-24 15:00:34 UTC (rev 80982)
+++ festconfig.diff 2010-05-24 15:00:50 UTC (rev 80983)
@@ -29,17 +29,14 @@
include $(EST)/config/systems/default.mak
-DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6
--JAVA=/usr/bin/java
--JAVAC=/usr/bin/javac
--JAVAH=/usr/bin/javah
-+DEFAULT_JAVA_HOME=/opt/java
-+JAVA=/opt/java/bin/java
-+JAVAC=/opt/java/bin/javac
-+JAVAH=/opt/java/bin/javah
++DEFAULT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ JAVA=/usr/bin/java
+ JAVAC=/usr/bin/javac
+ JAVAH=/usr/bin/javah
TCL_LIBRARY = -ltcl
-OS_LIBS = -ldl
-+OS_LIBS = -ldl -lncurses
++OS_LIBS = -ldl -lncurses
## the native audio module for this type of system
NATIVE_AUDIO_MODULE = LINUX16
Deleted: festival-1.96_beta-gcc43.patch
===================================================================
--- festival-1.96_beta-gcc43.patch 2010-05-24 15:00:34 UTC (rev 80982)
+++ festival-1.96_beta-gcc43.patch 2010-05-24 15:00:50 UTC (rev 80983)
@@ -1,12 +0,0 @@
-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;
Deleted: speech-tools-1.2.96_beta-gcc42.patch
===================================================================
--- speech-tools-1.2.96_beta-gcc42.patch 2010-05-24 15:00:34 UTC (rev 80982)
+++ speech-tools-1.2.96_beta-gcc42.patch 2010-05-24 15:00:50 UTC (rev 80983)
@@ -1,61 +0,0 @@
---- 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
Deleted: speech-tools-1.2.96_beta-gcc43-include.patch
===================================================================
--- speech-tools-1.2.96_beta-gcc43-include.patch 2010-05-24 15:00:34 UTC (rev 80982)
+++ speech-tools-1.2.96_beta-gcc43-include.patch 2010-05-24 15:00:50 UTC (rev 80983)
@@ -1,22 +0,0 @@
-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