Started update to 2.1

Removed patches applied upstream

diff --git a/festival-asterisk.patch b/festival-asterisk.patch
deleted file mode 100644 (file)
index 5b5f7d5..0000000
--- a/festival-asterisk.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -u -r festival-1.4.2/lib/tts.scm festival-1.4.2-asterisk/lib/tts.scm
---- festival-1.4.2/lib/tts.scm Wed Jan  8 09:54:14 2003
-+++ festival-1.4.2-asterisk/lib/tts.scm        Tue Jan  7 08:51:44 2003
-@@ -236,6 +236,15 @@
-        (utt.synth
-       (eval (list 'Utterance 'Text string))))))
- 
-+(define (tts_textasterisk string mode)
-+  "(tts_textasterisk STRING MODE)
-+Apply tts to STRING.  This function is specifically designed for
-+use in server mode so a single function call may synthesize the string.
-+This function name may be added to the server safe functions."
-+  (utt.send.wave.asterisk 
-+   (utt.synth
-+    (eval (list 'Utterance 'Text string)))))
-+
- (define (tts_return_to_client)
-   "(tts_return_to_client)
- This function is called by clients who wish to return waveforms of
-diff -u -r festival-1.4.2/src/arch/festival/wave.cc festival-1.4.2-asterisk/src/arch/festival/wave.cc
---- festival-1.4.2/src/arch/festival/wave.cc   Mon Jun  4 07:40:10 2001
-+++ festival-1.4.2-asterisk/src/arch/festival/wave.cc  Tue Jan  7 08:53:09 2003
-@@ -381,6 +381,38 @@
-       type = "nist";
-     else
-       type = get_c_string(ltype);
-+
-+    w->save(tmpfile,type);
-+    write(ft_server_socket,"WV\n",3);
-+    socket_send_file(ft_server_socket,tmpfile);
-+    unlink(tmpfile);
-+
-+    return utt;
-+}
-+
-+static LISP utt_send_wave_asterisk(LISP utt)
-+{
-+    // Send the waveform to a client (must be acting as server)
-+    EST_Utterance *u = utterance(utt);
-+    EST_Wave *w;
-+    EST_String tmpfile = make_tmp_filename();
-+    LISP ltype;
-+    EST_String type;
-+
-+    w = get_utt_wave(u);
-+    if (ft_server_socket == -1)
-+    {
-+      cerr << "utt_send_wave_client: not in server mode" << endl;
-+      festival_error();
-+    }
-+      
-+    ltype = ft_get_param("Wavefiletype");
-+    if (ltype == NIL)
-+      type = "nist";
-+    else
-+      type = get_c_string(ltype);
-+    w->resample(8000);
-+    w->rescale(5);
-     w->save(tmpfile,type);
- #ifdef WIN32
-     send(ft_server_socket,"WV\n",3,0);
-@@ -465,6 +497,13 @@
-  "(utt.send.wave.client UTT)\n\
-   Sends wave in UTT to client.  If not in server mode gives an error\n\
-   Note the client must be expecting to receive the waveform.");
-+
-+    init_subr_1("utt.send.wave.asterisk",utt_send_wave_asterisk,
-+ "(utt.send.wave.asterisk UTT)\n"
-+  "Sends wave in UTT to client.  If not in server mode gives an error\n"
-+  "Note the client must be expecting to receive the waveform. The waveform"
-+  "is rescaled and resampled according to what asterisk needs");
-+
-     init_subr_1("send_sexpr_to_client", send_sexpr_to_client,
-  "(send_sexpr_to_client SEXPR)\n\
- Sends given sexpression to currently connected client.");

diff --git a/festival-gcc4.patch b/festival-gcc4.patch
deleted file mode 100644 (file)
index 24aa0cc..0000000
--- a/festival-gcc4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur festival.org/src/modules/clunits/clunits.h festival/src/modules/clunits/clunits.h
---- festival.org/src/modules/clunits/clunits.h 2001-07-05 12:19:09.000000000 +0000
-+++ festival/src/modules/clunits/clunits.h     2006-04-01 20:36:30.552506750 +0000
-@@ -83,9 +83,9 @@
-     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);
- };
- 
- 

diff --git a/festival.spec b/festival.spec
index a50b11ce5ba2d183e02a6e6f642633611617a917..3df5f0e97a0a47fede3256d1ecaf650ca68ede3d 100644 (file)
--- a/festival.spec
+++ b/festival.spec
@@ -2,26 +2,23 @@
 Summary:       The Festival speech sythesis system
 Summary(pl.UTF-8):     System syntezy mowy Festival
 Name:          festival
-Version:       1.4.4
-%define                rel     7
-%define                _snap   20030803
-Release:       0.%{_snap}.%{rel}
+Version:       2.1
+Release:       0.1
 License:       BSD-like (except for festival.el, which is on GPL)
 Group:         Applications/Sound
-#Source0:      http://www.cstr.ed.ac.uk/download/festival/%{version}/%{name}-%{version}-release.tar.gz
-Source0:       http://www.festvox.org/packed/festival/latest/festival-%{version}-current%{_snap}.tar.gz
-# Source0-md5: ffaa7533b3f50791aabfbf1cee09ca85
-Source1:       http://www.cstr.ed.ac.uk/download/festival/%{version}/festvox_us1.tar.gz
-# Source1-md5: d0c3e727003e715a65daf01003101813
-Source2:       http://www.cstr.ed.ac.uk/download/festival/%{version}/festvox_us2.tar.gz
-# Source2-md5: fbcc8baacbff3aa2aaaf5a93701bb5e0
-Source3:       http://www.cstr.ed.ac.uk/download/festival/%{version}/festvox_us3.tar.gz
-# Source3-md5: 06dbfe2edaab6ffa31deeaf522e0c33e
-Source4:       http://www.cstr.ed.ac.uk/download/festival/%{version}/festvox_en1.tar.gz
-# Source4-md5: 66e3bc07751d7e31826185649c5ada5a
+Source0:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/%{name}-%{version}-release.tar.gz
+# Source0-md5: c93eb3e389ed171ab9abd46afe8897a8
+Source1:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/festvox_cmu_us_awb_cg.tar.gz
+# Source1-md5: 2c14269587ad018ee93176bb44f4c38b
+Source2:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/festvox_cmu_us_rms_cg.tar.gz
+# Source2-md5: a9514a9df32401774c074abec42ffb22
+Source3:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/festvox_cmu_us_slt_arctic_hts.tar.gz
+# Source3-md5: a9b53441968f6bc612b85c04bbc4cf0f
+Source4:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/festvox_kallpc16k.tar.gz
+# Source4-md5: 3869af78f473b616601cac3fa83cc14e
+Source5:       http://www.cstr.ed.ac.uk/downloads/festival/%{version}/festvox_rablpc16k.tar.gz
+# Source5-md5: 34cb2478f5b8fa1ed02f5cbb496c1dcd
 Patch0:                %{name}-config.patch
-Patch1:                %{name}-asterisk.patch
-Patch2:                %{name}-gcc4.patch
 URL:           http://www.cstr.ed.ac.uk/projects/festival/
 BuildRequires: automake
 BuildRequires: speech_tools-devel
@@ -84,10 +81,8 @@ Files needed to use en1 voice from mbrola packages.
 Pliki potrzebne do użycia głosu en1 z pakietu mbrola.
 
 %prep
-%setup -q -n %{name} -b1 -b2 -b3 -b4
+%setup -q -n %{name} -b1 -b2 -b3 -b4 -b5
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.* .