OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Mar-2008 17:15:30
Branch: HEAD Handle: 2008032116152900
Modified files:
openpkg-src/festival festival.patch festival.spec
Log:
try to get the stuff working in a more portable way
Summary:
Revision Changes Path
1.6 +39 -16 openpkg-src/festival/festival.patch
1.8 +3 -3 openpkg-src/festival/festival.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/festival/festival.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 festival.patch
--- openpkg-src/festival/festival.patch 20 Mar 2008 23:26:57 -0000
1.5
+++ openpkg-src/festival/festival.patch 21 Mar 2008 16:15:29 -0000
1.6
@@ -1,6 +1,6 @@
Index: festival/doc/Makefile
--- festival/doc/Makefile.orig 2001-04-04 13:55:21 +0200
-+++ festival/doc/Makefile 2008-03-21 00:09:03 +0100
++++ festival/doc/Makefile 2008-03-21 17:09:26 +0100
@@ -56,7 +56,8 @@
banner.inc $(DOCXXIMAGES)
@@ -21,8 +21,8 @@
include $(TOP)/config/common_make_rules
include $(EST)/config/rules/doc.mak
Index: festival/doc/text2wave.head
---- /dev/null 2008-03-21 00:09:07 +0100
-+++ festival/doc/text2wave.head 2008-03-21 00:09:03 +0100
+--- /dev/null 2008-03-21 17:10:37 +0100
++++ festival/doc/text2wave.head 2008-03-21 17:09:26 +0100
@@ -0,0 +1,19 @@
+.TH TEXT2WAVE 1 "6th Apr 1998"
+.SH NAME
@@ -44,8 +44,8 @@
+
+.SH OPTIONS
Index: festival/doc/text2wave.options
---- /dev/null 2008-03-21 00:09:07 +0100
-+++ festival/doc/text2wave.options 2008-03-21 00:09:03 +0100
+--- /dev/null 2008-03-21 17:10:37 +0100
++++ festival/doc/text2wave.options 2008-03-21 17:09:26 +0100
@@ -0,0 +1,47 @@
+.\"
+.\".SH OPTIONS
@@ -95,8 +95,8 @@
+.br
+File or lisp s-expression to be evaluated before synthesis.
Index: festival/doc/text2wave.tail
---- /dev/null 2008-03-21 00:09:07 +0100
-+++ festival/doc/text2wave.tail 2008-03-21 00:09:03 +0100
+--- /dev/null 2008-03-21 17:10:37 +0100
++++ festival/doc/text2wave.tail 2008-03-21 17:09:26 +0100
@@ -0,0 +1,26 @@
+
+.SH BUGS
@@ -126,7 +126,7 @@
+http://www.cstr.ed.ac.uk/projects/festival.html
Index: festival/lib/init.scm
--- festival/lib/init.scm.orig 2004-07-16 01:03:04 +0200
-+++ festival/lib/init.scm 2008-03-21 00:09:03 +0100
++++ festival/lib/init.scm 2008-03-21 17:09:26 +0100
@@ -55,6 +55,10 @@
(if (probe_file (path-append libdir "sitevars.scm"))
(load (path-append libdir "sitevars.scm")))
@@ -151,7 +151,7 @@
(if (probe_file (path-append home-directory ".siodrc"))
Index: festival/lib/multisyn/multisyn_pauses.scm
--- festival/lib/multisyn/multisyn_pauses.scm.orig 2004-06-21 16:19:30
+0200
-+++ festival/lib/multisyn/multisyn_pauses.scm 2008-03-21 00:09:03
+0100
++++ festival/lib/multisyn/multisyn_pauses.scm 2008-03-21 17:09:26
+0100
@@ -85,8 +85,8 @@
(let ((silence (car (cadr (car (PhoneSet.description '(silences))))))
(seg (item.relation (find_last_seg word) 'Segment))
@@ -165,7 +165,7 @@
(not (string-equal (item.name (item.next seg)) silence)))
Index: festival/lib/tts.scm
--- festival/lib/tts.scm.orig 2005-05-09 16:12:06 +0200
-+++ festival/lib/tts.scm 2008-03-21 00:09:03 +0100
++++ festival/lib/tts.scm 2008-03-21 17:09:26 +0100
@@ -89,7 +89,7 @@
;;; The program used to parse stml files
@@ -177,7 +177,7 @@
nsgml-1.0 from the sp SGML package. [see XML/SGML requirements]")
Index: festival/lib/voices.scm
--- festival/lib/voices.scm.orig 2005-05-02 16:20:37 +0200
-+++ festival/lib/voices.scm 2008-03-21 00:09:03 +0100
++++ festival/lib/voices.scm 2008-03-21 17:09:26 +0100
@@ -42,7 +42,7 @@
;; The path to search for voices is created from the load-path with
;; an extra list of directories appended.
@@ -189,7 +189,7 @@
found, this can be redefined in lib/sitevars.scm if desired.")
Index: festival/src/arch/festival/audspio.cc
--- festival/src/arch/festival/audspio.cc.orig 2004-09-30 15:04:17
+0200
-+++ festival/src/arch/festival/audspio.cc 2008-03-21 00:09:03 +0100
++++ festival/src/arch/festival/audspio.cc 2008-03-21 17:09:26 +0100
@@ -108,7 +108,7 @@
{
audio = ft_get_param("Audio_Method");
@@ -199,9 +199,21 @@
if (audio != NIL)
audsp_send(EST_String("method ")+get_c_string(audio));
if (command != NIL)
+Index: speech_tools/config/config.in
+--- speech_tools/config/config.in.orig 2006-07-08 20:06:18 +0200
++++ speech_tools/config/config.in 2008-03-21 17:10:35 +0100
+@@ -83,7 +83,7 @@
+ # INCLUDE_MODULES += ESD_AUDIO
+
+ ## Native audio for your platform (sun, linux, freebsd, irix, macosx,
windows)
+-INCLUDE_MODULES += NATIVE_AUDIO
++# INCLUDE_MODULES += NATIVE_AUDIO
+
+ ## Special code to run Windows MPLAYER
+ # INCLUDE_MODULES += MPLAYER_AUDIO
Index: speech_tools/config/rules/install.mak
--- speech_tools/config/rules/install.mak.orig 2001-04-04 13:55:32
+0200
-+++ speech_tools/config/rules/install.mak 2008-03-21 00:09:03 +0100
++++ speech_tools/config/rules/install.mak 2008-03-21 17:09:26 +0100
@@ -39,7 +39,7 @@
@@ -211,9 +223,20 @@
PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd))
+Index: speech_tools/config/system.sh
+--- speech_tools/config/system.sh.orig 2002-12-27 19:39:26 +0100
++++ speech_tools/config/system.sh 2008-03-21 17:09:26 +0100
+@@ -94,6 +94,7 @@
+ elif [ "$OSTYPE" = "Darwin" ]; then
+ OSREV=
+ else
++ MACHINETYPE=unknown
+ OSTYPE=unknown
+ OSREV=
+ fi
Index: speech_tools/include/EST_unix.h
--- speech_tools/include/EST_unix.h.orig 2004-04-30 18:56:49 +0200
-+++ speech_tools/include/EST_unix.h 2008-03-21 00:09:03 +0100
++++ speech_tools/include/EST_unix.h 2008-03-21 17:09:26 +0100
@@ -53,6 +53,7 @@
# include <sys/wait.h>
# include <sys/resource.h>
@@ -224,7 +247,7 @@
# include "win32/EST_unix_win32.h"
Index: speech_tools/testsuite/correct/matrix_regression.out
--- speech_tools/testsuite/correct/matrix_regression.out.orig
2001-04-04 13:55:32 +0200
-+++ speech_tools/testsuite/correct/matrix_regression.out 2008-03-21
00:09:03 +0100
++++ speech_tools/testsuite/correct/matrix_regression.out 2008-03-21
17:09:26 +0100
@@ -1,5 +1,3 @@
-EST_TVector<int> size = 20 bytes.
-EST_TMatrix<int> size = 28 bytes.
@@ -233,7 +256,7 @@
100 101 102 103 104
Index: speech_tools/testsuite/matrix_regression.cc
--- speech_tools/testsuite/matrix_regression.cc.orig 2004-09-30 14:53:37
+0200
-+++ speech_tools/testsuite/matrix_regression.cc 2008-03-21 00:09:03
+0100
++++ speech_tools/testsuite/matrix_regression.cc 2008-03-21 17:09:26
+0100
@@ -54,9 +54,6 @@
{
EST_TMatrix<int> m(5,5);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/festival/festival.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 festival.spec
--- openpkg-src/festival/festival.spec 21 Mar 2008 15:51:17 -0000
1.7
+++ openpkg-src/festival/festival.spec 21 Mar 2008 16:15:29 -0000
1.8
@@ -140,11 +140,11 @@
festival/src/modules/Makefile
%endif
- # support AMD64 platforms
+ # support additional platforms
cp festival/config/systems/ix86_FreeBSD.mak \
- festival/config/systems/amd64_FreeBSD.mak
+ festival/config/systems/unknown_FreeBSD.mak
cp festival/config/systems/ix86_SunOS5.mak \
- festival/config/systems/amd64_SunOS5.mak
+ festival/config/systems/unknown_SunOS5.mak
# build speech tools
( cd speech_tools
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
