diff --git a/src/mod/asr_tts/mod_flite/Makefile b/src/mod/asr_tts/mod_flite/Makefile index 3ddf89eae0..f544e9625f 100644 --- a/src/mod/asr_tts/mod_flite/Makefile +++ b/src/mod/asr_tts/mod_flite/Makefile @@ -1,4 +1,4 @@ -FLITE=flite-1.3-current +FLITE=flite-1.3.99 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE) FLITE_LIBDIR=$(FLITE_DIR)/build/libs FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_kal.a $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a @@ -11,8 +11,6 @@ include $(BASE)/build/modmake.rules $(FLITE_DIR): $(GETLIB) $(FLITE).tar.gz - cp flite-1.3.diff $(FLITE_DIR) - cd $(FLITE_DIR) && patch -p1 -i flite-1.3.diff $(FLITE_DIR)/Makefile: $(FLITE_DIR) cd $(FLITE_DIR) && CFLAGS="-fPIC" ./configure diff --git a/src/mod/asr_tts/mod_flite/flite-1.3.diff b/src/mod/asr_tts/mod_flite/flite-1.3.diff deleted file mode 100644 index bcd9cd09dd..0000000000 --- a/src/mod/asr_tts/mod_flite/flite-1.3.diff +++ /dev/null @@ -1,95 +0,0 @@ -diff -ur /root/flite-1.3-current/include/cst_file.h flite-1.3-current/include/cst_file.h ---- /root/flite-1.3-current/include/cst_file.h 2005-02-07 07:26:42.000000000 -0600 -+++ flite-1.3-current/include/cst_file.h 2008-07-18 18:08:13.000000000 -0500 -@@ -53,7 +53,6 @@ - #include - typedef FILE * cst_file; - #else --#include - #include - typedef FILE * cst_file; - #endif -Only in flite-1.3-current/include: cst_file.h~ -diff -ur /root/flite-1.3-current/include/cst_val.h flite-1.3-current/include/cst_val.h ---- /root/flite-1.3-current/include/cst_val.h 2004-12-19 14:34:19.000000000 -0600 -+++ flite-1.3-current/include/cst_val.h 2008-07-18 18:07:57.000000000 -0500 -@@ -145,6 +145,6 @@ - - /* Generic pointer vals */ - typedef void cst_userdata; --CST_VAL_USER_TYPE_DCLS(userdata,cst_userdata); -+CST_VAL_USER_TYPE_DCLS(userdata,cst_userdata) - - #endif -diff -ur /root/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c ---- /root/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2004-12-31 17:22:10.000000000 -0600 -+++ flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c 2008-07-18 18:07:57.000000000 -0500 -@@ -50,8 +50,14 @@ - - cst_voice *register_cmu_us_kal(const char *voxdir) - { -- cst_voice *v = new_voice(); -+ cst_voice *v; - -+ if (cmu_us_kal_diphone) { -+ return cmu_us_kal_diphone; -+ } -+ -+ v = new_voice(); -+ - /* Set up basic values for synthesizing with this voice */ - usenglish_init(v); - feat_set_string(v->features,"name","cmu_us_kal_diphone"); -diff -ur /root/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c ---- /root/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2005-01-03 08:08:06.000000000 -0600 -+++ flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c 2008-07-18 18:07:57.000000000 -0500 -@@ -46,16 +46,22 @@ - static cst_utterance *cmu_us_kal_postlex(cst_utterance *u); - extern cst_diphone_db cmu_us_kal16_db; - --cst_voice *cmu_us_kal_diphone = NULL; -+cst_voice *cmu_us_kal16_diphone = NULL; - --cst_voice *register_cmu_us_kal(const char *voxdir) -+cst_voice *register_cmu_us_kal16(const char *voxdir) - { -- cst_voice *v = new_voice(); -+ cst_voice *v; -+ -+ if (cmu_us_kal16_diphone) { -+ return cmu_us_kal16_diphone; -+ } -+ -+ v = new_voice(); - - usenglish_init(v); - - /* Set up basic values for synthesizing with this voice */ -- feat_set_string(v->features,"name","cmu_us_kal_diphone"); -+ feat_set_string(v->features,"name","cmu_us_kal16_diphone"); - - /* Lexicon */ - cmu_lex_init(); -@@ -78,17 +84,17 @@ - feat_set_string(v->features,"resynth_type","fixed"); - feat_set_string(v->features,"join_type","modified_lpc"); - -- cmu_us_kal_diphone = v; -+ cmu_us_kal16_diphone = v; - -- return cmu_us_kal_diphone; -+ return cmu_us_kal16_diphone; - } - --void unregister_cmu_us_kal(cst_voice *v) -+void unregister_cmu_us_kal16(cst_voice *v) - { -- if (v != cmu_us_kal_diphone) -+ if (v != cmu_us_kal16_diphone) - return; - delete_voice(v); -- cmu_us_kal_diphone = NULL; -+ cmu_us_kal16_diphone = NULL; - } - - static void fix_ah(cst_utterance *u)