From 8d1c618cec55242e56a16b6a8755a2e1b392752c Mon Sep 17 00:00:00 2001
From: Daniel Wolf <dwolf@dannad.de>
Date: Thu, 2 Jun 2016 18:19:25 +0200
Subject: [PATCH] Patched Flite to prevent name collision with PocketSphinx

---
 lib/flite-1.4/include/cst_features.h   |  2 +-
 lib/flite-1.4/src/synth/cst_ssml.c     |  2 +-
 lib/flite-1.4/src/utils/cst_features.c |  2 +-
 lib/flite.patch                        | 38 ++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 lib/flite.patch

diff --git a/lib/flite-1.4/include/cst_features.h b/lib/flite-1.4/include/cst_features.h
index 373fe7e..c9b6383 100644
--- a/lib/flite-1.4/include/cst_features.h
+++ b/lib/flite-1.4/include/cst_features.h
@@ -84,6 +84,6 @@ int feat_length(const cst_features *f);
 CST_VAL_USER_TYPE_DCLS(features,cst_features)
 
 int feat_copy_into(const cst_features *from,cst_features *to);
-int feat_print(cst_file fd,const cst_features *f);
+int flite_feat_print(cst_file fd,const cst_features *f);
 
 #endif
diff --git a/lib/flite-1.4/src/synth/cst_ssml.c b/lib/flite-1.4/src/synth/cst_ssml.c
index f1e635e..b32325b 100644
--- a/lib/flite-1.4/src/synth/cst_ssml.c
+++ b/lib/flite-1.4/src/synth/cst_ssml.c
@@ -152,7 +152,7 @@ static cst_utterance *ssml_apply_tag(const char *tag,
                                      cst_features *word_feats)
 {
     printf("SSML TAG %s\n",tag);
-    feat_print(stdout,attributes);
+    flite_feat_print(stdout,attributes);
     printf("...\n");
 
     /* do stuff */
diff --git a/lib/flite-1.4/src/utils/cst_features.c b/lib/flite-1.4/src/utils/cst_features.c
index 671bb16..32b5473 100644
--- a/lib/flite-1.4/src/utils/cst_features.c
+++ b/lib/flite-1.4/src/utils/cst_features.c
@@ -258,7 +258,7 @@ int feat_copy_into(const cst_features *from,cst_features *to)
     return i;
 }
 
-int feat_print(cst_file fd,const cst_features *f)
+int flite_feat_print(cst_file fd,const cst_features *f)
 {
     cst_featvalpair *p;
     
diff --git a/lib/flite.patch b/lib/flite.patch
new file mode 100644
index 0000000..6aa9c7f
--- /dev/null
+++ b/lib/flite.patch
@@ -0,0 +1,38 @@
+diff --git a/lib/flite-1.4/include/cst_features.h b/lib/flite-1.4/include/cst_features.h
+index 373fe7e..c9b6383 100644
+--- a/lib/flite-1.4/include/cst_features.h
++++ b/lib/flite-1.4/include/cst_features.h
+@@ -84,6 +84,6 @@ int feat_length(const cst_features *f);
+ CST_VAL_USER_TYPE_DCLS(features,cst_features)
+ 
+ int feat_copy_into(const cst_features *from,cst_features *to);
+-int feat_print(cst_file fd,const cst_features *f);
++int flite_feat_print(cst_file fd,const cst_features *f);
+ 
+ #endif
+diff --git a/lib/flite-1.4/src/synth/cst_ssml.c b/lib/flite-1.4/src/synth/cst_ssml.c
+index f1e635e..b32325b 100644
+--- a/lib/flite-1.4/src/synth/cst_ssml.c
++++ b/lib/flite-1.4/src/synth/cst_ssml.c
+@@ -152,7 +152,7 @@ static cst_utterance *ssml_apply_tag(const char *tag,
+                                      cst_features *word_feats)
+ {
+     printf("SSML TAG %s\n",tag);
+-    feat_print(stdout,attributes);
++    flite_feat_print(stdout,attributes);
+     printf("...\n");
+ 
+     /* do stuff */
+diff --git a/lib/flite-1.4/src/utils/cst_features.c b/lib/flite-1.4/src/utils/cst_features.c
+index 671bb16..32b5473 100644
+--- a/lib/flite-1.4/src/utils/cst_features.c
++++ b/lib/flite-1.4/src/utils/cst_features.c
+@@ -258,7 +258,7 @@ int feat_copy_into(const cst_features *from,cst_features *to)
+     return i;
+ }
+ 
+-int feat_print(cst_file fd,const cst_features *f)
++int flite_feat_print(cst_file fd,const cst_features *f)
+ {
+     cst_featvalpair *p;
+