From 716d82407a117de0572a60d8669b9980bcf2a393 Mon Sep 17 00:00:00 2001 From: Brian West Date: Fri, 18 Jul 2008 23:10:44 +0000 Subject: [PATCH] make flite work on mac also... doesn't break linux build either. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9102 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/asr_tts/mod_flite/flite-1.3.diff | 30 +++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/mod/asr_tts/mod_flite/flite-1.3.diff b/src/mod/asr_tts/mod_flite/flite-1.3.diff index 65d009841e..bcd9cd09dd 100644 --- a/src/mod/asr_tts/mod_flite/flite-1.3.diff +++ b/src/mod/asr_tts/mod_flite/flite-1.3.diff @@ -1,6 +1,18 @@ -diff -ru /usr/src/flite-1.3-current/include/cst_val.h flite-1.3-current/include/cst_val.h ---- /usr/src/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-09 12:44:26.000000000 -0500 +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 */ @@ -9,9 +21,9 @@ diff -ru /usr/src/flite-1.3-current/include/cst_val.h flite-1.3-current/include/ +CST_VAL_USER_TYPE_DCLS(userdata,cst_userdata) #endif -diff -ru /usr/src/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c ---- /usr/src/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-09 12:36:53.000000000 -0500 +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) @@ -28,9 +40,9 @@ diff -ru /usr/src/flite-1.3-current/lang/cmu_us_kal/cmu_us_kal.c flite-1.3-curre /* Set up basic values for synthesizing with this voice */ usenglish_init(v); feat_set_string(v->features,"name","cmu_us_kal_diphone"); -diff -ru /usr/src/flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c flite-1.3-current/lang/cmu_us_kal16/cmu_us_kal16.c ---- /usr/src/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-09 12:36:53.000000000 -0500 +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;