[arch-commits] CVS update of extra/multimedia/festival (PKGBUILD config.diff)

Simo Leone simo at archlinux.org
Wed Jun 27 11:59:05 EDT 2007


    Date: Wednesday, June 27, 2007 @ 11:59:05
  Author: simo
    Path: /home/cvs-extra/extra/multimedia/festival

Modified: PKGBUILD (1.2 -> 1.3) config.diff (1.1 -> 1.2)

upgpkg: festival 1.96beta-1


-------------+
 PKGBUILD    |   41 ++++++---------
 config.diff |  155 ++++++++++++++++++++++++++--------------------------------
 2 files changed, 89 insertions(+), 107 deletions(-)


Index: extra/multimedia/festival/PKGBUILD
diff -u extra/multimedia/festival/PKGBUILD:1.2 extra/multimedia/festival/PKGBUILD:1.3
--- extra/multimedia/festival/PKGBUILD:1.2	Tue Sep  5 08:06:05 2006
+++ extra/multimedia/festival/PKGBUILD	Wed Jun 27 11:59:04 2007
@@ -1,34 +1,25 @@
-# $Id: PKGBUILD,v 1.2 2006/09/05 12:06:05 andyrtr Exp $
+# $Id: PKGBUILD,v 1.3 2007/06/27 15:59:04 simo Exp $
 # vim: ft=sh ts=2 sw=2
 #Maintainer: Simo Leone <neotuli at gmail.com>
 #Contributor: Simo Leone <neotuli at gmail.com>
 pkgname=festival
-pkgver=1.95beta
-pkgverorig=1.95-beta
-pkgrel=2
+pkgver=1.96beta
+pkgverorig=1.96-beta
+pkgrel=1
 pkgdesc="Festival is a general multi-lingual speech synthesis system developed at CSTR (Centre for Speech Technology Research)."
 license=""
+arch=('i686')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
 depends=('perl')
-source=("http://www.cstr.inf.ed.ac.uk/downloads/festival/1.95/$pkgname-$pkgverorig.tar.gz" \
-	"http://www.cstr.inf.ed.ac.uk/downloads/festival/1.95/speech_tools-1.2.95-beta.tar.gz" \
-	"http://www.cstr.inf.ed.ac.uk/downloads/festival/1.95/festlex_POSLEX.tar.gz" \
-	"http://www.cstr.inf.ed.ac.uk/downloads/festival/1.95/festlex_CMU.tar.gz" \
-	"http://www.cstr.inf.ed.ac.uk/downloads/festival/1.95/festlex_OALD.tar.gz" \
-	"config.diff" "festconfig.diff" \
-	festival-1.95_beta-gcc41.patch \
-	festival-1.95_beta-gcc41-amd64.patch festival-1.95_beta-gcc41-amd64-int-pointer.patch)
+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")
 
 build() {
 	export MAKEFLAGS="-j1"
-	# fixes from Gentoo
-	cd $startdir/src/
-	patch -Np0 -i festival-1.95_beta-gcc41.patch || return 1
-
-	if [ "$CARCH" = "x86_64" ]; then
-	  patch -Np0 -i festival-1.95_beta-gcc41-amd64.patch || return 1
-	  patch -Np0 -i festival-1.95_beta-gcc41-amd64-int-pointer.patch || return 1
-	fi
 
 	##################################################################
 	#Speech Tools first
@@ -81,8 +72,10 @@
 	done
 	rm -rf `find $startdir/pkg -name Makefile`	
 }
-
-md5sums=('0a44e30f922fa57ed1a7aa437baf4dd6' '4a0a58d8c4bafaee9f0a913372ded8bd'\
-         '742c266e4c4978fae2b5c1bf6f549eb4' '86a765c48d6b64134b28af45affec1bf'\
-         '45a03689025849d02ec963a5b338ef37' '9fb82fcae555b3c4b297047e8c4e0058'\
+md5sums=('74915f4ffb13471c7e529ae92b392453'
+         '887e0c7586facb97cfc0114a105763b2'
+         '742c266e4c4978fae2b5c1bf6f549eb4'
+         '66d39c6f7b8e9d9beade051312365020'
+         '45a03689025849d02ec963a5b338ef37'
+         'd57d669a1751b98359bea7cd15991e89'
          '04a7517509d28e36023fd865f998cf86')
Index: extra/multimedia/festival/config.diff
diff -u extra/multimedia/festival/config.diff:1.1 extra/multimedia/festival/config.diff:1.2
--- extra/multimedia/festival/config.diff:1.1	Tue Feb 21 20:48:01 2006
+++ extra/multimedia/festival/config.diff	Wed Jun 27 11:59:05 2007
@@ -10,89 +10,6 @@
  
  DEBUG_JAVAFLAGS = -g
  
-diff -Nru speech_tools.orig/config/config.in speech_tools/config/config.in
---- speech_tools.orig/config/config.in	2004-05-29 13:34:39.000000000 -0500
-+++ speech_tools/config/config.in	2005-05-30 19:50:54.000000000 -0500
-@@ -15,7 +15,7 @@
- ## You may need to set this explicitly if automounter or NFS
- ## side effects cause problems
- 
--EST_HOME := $(shell (cd $(EST); pwd))
-+EST_HOME := /usr
- 
- ###########################################################################
- ## System type. 
-@@ -28,14 +28,14 @@
- ## 
- ## Examples: sparc_SunOS5 intel_Linux2.0
- 
--SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
-+SYSTEM_TYPE=Linux
- 
- ###########################################################################
- ## Compiler.
- ## The definitions are in compilers/$(COMPILER).mak
- ## Examples: gcc suncc egcs gcc28
- 
--COMPILER=@COMPILERTYPE@
-+COMPILER=gcc32
- 
- ###########################################################################
- ## Java system to use if you include the Java interface.
-@@ -61,7 +61,7 @@
- # VERBOSE=1
- # DEBUG=1
- # PROFILE=gprof
--# SHARED=1
-+SHARED=1
- 
- ## Directory specific selections which override the above
- 
-@@ -94,7 +94,7 @@
- ## It may not work under all systems, so may be optionally omitted.
- INCLUDE_MODULES += EDITLINE
- 
--TERMCAPLIB = @TERMCAPLIB@
-+TERMCAPLIB =
- # speech recognition
- #INCLUDE_MODULES += ASR
- 
-@@ -116,17 +116,17 @@
- 
- 
- ## Define this to include the pure Java code
--# INCLUDE_MODULES += JAVA
-+#INCLUDE_MODULES += JAVA
- # JAVA_HOME = PUT_SOMETHING_HERE
- 
- ## Define this to compile the Java interface to the EST classes. You
- ## need to compile with the SHARED option above. This is required for
- ## fringe.
--# INCLUDE_MODULES += JAVA_CPP
-+#INCLUDE_MODULES += JAVA_CPP
- 
- ## Define this to have the Java code use the Java Media API to
- ## play sounds etc.
--# INCLUDE_MODULES += JAVA_MEDIA
-+#INCLUDE_MODULES += JAVA_MEDIA
- # JMF_HOME = PUT_SOMETHING_HERE
- 
- ## Richard Tobin's RXP XML parser.
-@@ -152,11 +152,11 @@
- #CONFIG_SWIG_COMPILER = /usr/bin/swig
- 
- # Languages to generate wrappers for. Currently: PYTHON and PERL5
--#CONFIG_WRAPPER_LANGUAGES = PYTHON PERL5
-+CONFIG_WRAPPER_LANGUAGES = PYTHON PERL5
- 
- # 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.4/
-+CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.8.3/i686-linux-thread-multi/CORE/
- #OR OLD#CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.6.1/i386-linux/CORE/
- ##
- ###################################################################
 diff -Nru speech_tools.orig/config/systems/Linux.mak speech_tools/config/systems/Linux.mak
 --- speech_tools.orig/config/systems/Linux.mak	2001-04-04 06:55:32.000000000 -0500
 +++ speech_tools/config/systems/Linux.mak	2005-05-30 19:52:06.000000000 -0500
@@ -157,3 +74,75 @@
  
  ###########################################################################
  ## Commands.
+--- a/config/config.in	2006-07-08 13:06:18.000000000 -0500
++++ b/config/config.in.new	2007-06-27 10:35:51.000000000 -0500
+@@ -15,7 +15,7 @@
+ ## You may need to set this explicitly if automounter or NFS
+ ## side effects cause problems
+ 
+-EST_HOME := $(shell (cd $(EST); pwd))
++EST_HOME := /usr
+ 
+ ###########################################################################
+ ## System type. 
+@@ -28,14 +28,14 @@
+ ## 
+ ## Examples: sparc_SunOS5 intel_Linux2.0
+ 
+-SYSTEM_TYPE=$(MACHINETYPE)_$(OSTYPE)$(OSREV)
++SYSTEM_TYPE=Linux
+ 
+ ###########################################################################
+ ## Compiler.
+ ## The definitions are in compilers/$(COMPILER).mak
+ ## Examples: gcc suncc egcs gcc28
+ 
+-COMPILER=@COMPILERTYPE@
++COMPILER=gcc32
+ 
+ ###########################################################################
+ ## Java system to use if you include the Java interface.
+@@ -61,7 +61,7 @@
+ # VERBOSE=1
+ #DEBUG=1
+ # PROFILE=gprof
+-#SHARED=2
++SHARED=1
+ 
+ ## Directory specific selections which override the above
+ 
+@@ -94,7 +94,7 @@
+ ## It may not work under all systems, so may be optionally omitted.
+ INCLUDE_MODULES += EDITLINE
+ 
+-TERMCAPLIB = @TERMCAPLIB@
++TERMCAPLIB = 
+ # speech recognition
+ #INCLUDE_MODULES += ASR
+ 
+@@ -165,8 +165,8 @@
+ CONFIG_WRAPPER_LANGUAGES = PYTHON PERL5
+ 
+ # 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/
+ #OR OLD#CONFIG_PERL_INCLUDES= -I/usr/lib/perl5/5.6.1/i386-linux/CORE/
+ ##
+ ###################################################################
+--- a/config/compilers/gcc_defaults.mak	2006-08-05 10:37:59.000000000 -0500
++++ b/config/compilers/gcc_defaults.mak.new	2007-06-27 10:43:51.000000000 -0500
+@@ -76,9 +76,9 @@
+ 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




More information about the arch-commits mailing list