Unverified Kaydet (Commit) d6f29dbf authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

flite 2.1.2 sürümüne yükseltildi.

üst 5733e4ee
......@@ -10,11 +10,12 @@ from inary.actionsapi import shelltools
from inary.actionsapi import get
#WorkDir = "flite-%s-current" % get.srcVERSION()
def setup():
def setup():
autotools.autoreconf("-vif")
autotools.configure("--prefix=/usr \
--with-audio=alsa \
--with-vox=cmu_us_kal16")
--with-vox=cmu_us_kal16 ")
def build():
autotools.make()
......
--- a/configure.in
+++ b/configure.in
@@ -304,7 +304,6 @@
[ --with-audio with specific audio support (none linux freebsd etc) ],
AUDIODRIVER=$with_audio )
-if test "x$AUDIODEFS" = x; then
case "$AUDIODRIVER" in
linux|oss)
AUDIODRIVER=oss
@@ -325,9 +324,10 @@
;;
none)
AUDIODEFS=-DCST_AUDIO_NONE
+ AUDIOLIBS=
;;
esac
-fi
+
AC_SUBST(AUDIODRIVER)
AC_SUBST(AUDIODEFS)
AC_SUBST(AUDIOLIBS)
Index: flite-1.4-release/main/Makefile
===================================================================
--- flite-1.4-release.orig/main/Makefile
+++ flite-1.4-release/main/Makefile
@@ -85,17 +85,17 @@ $(BINDIR)/flite$(EXEEXT): flite_main.o $
$(TOP)/tools/make_voice_list $(VOICES)
rm -f flite_voice_list.o
$(MAKE) flite_voice_list.o
- $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LIBADD) -o $@
$(BINDIR)/flite_time$(EXEEXT): flite_time_main.o $(flite_time_LIBS_deps)
- $(CC) $(CFLAGS) -o $@ flite_time_main.o $(flite_time_LIBS_flags) $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) flite_time_main.o $(flite_time_LIBS_flags) $(FLITELIBFLAGS) $(LIBADD) -o $@
$(BINDIR)/t2p$(EXEEXT): t2p_main.o $(flite_LIBS_deps)
- $(CC) $(CFLAGS) -o $@ t2p_main.o $(flite_LIBS_flags) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) t2p_main.o $(flite_LIBS_flags) $(LIBADD) -o $@
$(BINDIR)/compile_regexes$(EXEEXT): compile_regexes.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ compile_regexes.o $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) compile_regexes.o $(FLITELIBFLAGS) $(LIBADD) -o $@
each:
@ for i in $(VOICES) ; \
@@ -107,7 +107,7 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $
$(TOP)/tools/make_voice_list $(VOICE)
rm -f flite_voice_list.o
$(MAKE) flite_voice_list.o
- $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) flite_main.o flite_voice_list.o $(flite_LIBS_flags) $(LIBADD) -o $@
install:
# The basic binaries
Index: flite-1.4-release/config/common_make_rules
===================================================================
--- flite-1.4-release.orig/config/common_make_rules
+++ flite-1.4-release/config/common_make_rules
@@ -69,7 +69,8 @@ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
ifdef SHFLAGS
FLITELIBS = $(LIBDIR)/libflite.so
-LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
+LIBADD += -L$(LIBDIR) -lflite $(OTHERLIBS)
+LDFLAGS +=
else
FLITELIBS = $(LIBDIR)/libflite.a
LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
Index: flite-1.4-release/tools/Makefile
===================================================================
--- flite-1.4-release.orig/tools/Makefile
+++ flite-1.4-release/tools/Makefile
@@ -62,9 +62,9 @@ include $(TOP)/config/common_make_rules
LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
$(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) find_sts_main.o $(FLITELIBFLAGS) $(LIBADD) -o $@
$(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) flite_sort_main.o $(FLITELIBFLAGS) $(LIBADD) -o $@
makescripts:
@ cp -p $(SCRIPTS) $(TOP)/bin
Index: flite-1.4-release/testsuite/Makefile
===================================================================
--- flite-1.4-release.orig/testsuite/Makefile
+++ flite-1.4-release/testsuite/Makefile
@@ -71,5 +71,5 @@ MAIN_O = $(SRCS:%=%_main.o)
$(MAIN_O) : %_main.o : %_main.c
$(CC) $(CFLAGS) -o $@ $<
$(ALL) : %$(EXEEXT) : %_main.o $(FLITELIBS)
- $(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LIBADD) -o $@
Index: flite-1.4-release/tools/Makefile.flite
===================================================================
--- flite-1.4-release.orig/tools/Makefile.flite
+++ flite-1.4-release/tools/Makefile.flite
@@ -103,7 +103,7 @@ $(VOICENAME)_mcep.o: $(VOICENAME)_mcep.c
$(CC) -I. -I$(FLITEDIR)/include -c -o $@ $<
flite_$(VOICENAME): flite_main.o flite_voice_list.o $(FLITELIBS) lib$(VOICENAME).a
- $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o $(LOCAL_LIBS) $(LOCAL_LANGLEX_LIBS) $(FLITELIBFLAGS) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(LDFLAGS) flite_main.o flite_voice_list.o $(LOCAL_LIBS) $(LOCAL_LANGLEX_LIBS) $(FLITELIBFLAGS) $(LIBADD) -o $@
.build_lib: $(OBJS)
@ $(AR) cruv $(LIBDIR)/lib$(VOICENAME).a $(OBJS)
Index: flite-1.4-release/config/common_make_rules
===================================================================
--- flite-1.4-release.orig/config/common_make_rules
+++ flite-1.4-release/config/common_make_rules
@@ -61,26 +61,34 @@ OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
BINDIR=$(BUILDDIR)/bin
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
BINDIR=$(TOP)/bin
+LIBDIR=$(TOP)/lib
endif
-LIBDIR=$(BUILDDIR)/lib
+#LIBDIR=$(BUILDDIR)/lib
BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
-FLITELIBS = $(BUILDDIR)/lib/libflite.a
-FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
+ifdef SHFLAGS
+FLITELIBS = $(LIBDIR)/libflite.so
+LDFLAGS += -L$(LIBDIR) -lflite $(OTHERLIBS)
+else
+FLITELIBS = $(LIBDIR)/libflite.a
+LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+endif
+
FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
ifdef SHFLAGS
SOOBJS = $(OBJS:.o=.os)
-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
ifdef LIBNAME
ALL += $(OBJDIR)/.build_so
endif
-endif
+else
ifdef LIBNAME
ALL += $(OBJDIR)/.build_lib
endif
+endif
+
# Only do some directories when you are not cross compiling
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
@@ -112,20 +120,21 @@ $(OBJDIR)/.build_lib: $(FULLOBJS)
@ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).a
@ touch $(OBJDIR)/.build_lib
-$(OBJDIR)/.build_so: $(FULLSHOBJS)
+$(OBJDIR)/.build_so: $(FULLSOOBJS)
@ (cd $(OBJDIR) && $(AR) cruv ../../../$(LIBDIR)/lib$(LIBNAME).shared.a $(SOOBJS))
@ $(RANLIB) $(LIBDIR)/lib$(LIBNAME).shared.a
@ touch $(OBJDIR)/.build_so
# Used in the lib/ directory and in building new voices
-$(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
+#$(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
+%.so: %.shared.a
@ echo making $@
@ rm -rf shared_os && mkdir shared_os
@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
- @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
@ rm -rf shared_os
$(OBJDIR)/.make_build_dirs:
Index: flite-1.4-release/lib/Makefile
===================================================================
--- /dev/null
+++ flite-1.4-release/lib/Makefile
@@ -0,0 +1,77 @@
+###########################################################################
+## ##
+## Language Technologies Institute ##
+## Carnegie Mellon University ##
+## Copyright (c) 1999 ##
+## All Rights Reserved. ##
+## ##
+## Permission is hereby granted, free of charge, to use and distribute ##
+## this software and its documentation without restriction, including ##
+## without limitation the rights to use, copy, modify, merge, publish, ##
+## distribute, sublicense, and/or sell copies of this work, and to ##
+## permit persons to whom this work is furnished to do so, subject to ##
+## the following conditions: ##
+## 1. The code must retain the above copyright notice, this list of ##
+## conditions and the following disclaimer. ##
+## 2. Any modifications must be clearly marked as such. ##
+## 3. Original authors' names are not deleted. ##
+## 4. The authors' names are not used to endorse or promote products ##
+## derived from this software without specific prior written ##
+## permission. ##
+## ##
+## CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK ##
+## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ##
+## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ##
+## SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE ##
+## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ##
+## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ##
+## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ##
+## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ##
+## THIS SOFTWARE. ##
+## ##
+###########################################################################
+## ##
+## FLITE libraries ##
+## ##
+###########################################################################
+TOP=..
+DIRNAME=lib
+BUILD_DIRS =
+ALL_DIRS=
+FILES = Makefile
+LIBNAMES = flite flite_cmulex flite_usenglish \
+ flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb \
+ flite_cmu_us_awb flite_cmu_us_rms flite_cmu_us_slt
+
+STATICLIBS= $(LIBNAMES:%=lib%.a)
+SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
+#SHAREDLIBS = $(LIBNAMES:%=lib%.so)
+SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
+VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+ALL_LIBS = $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
+
+ALL = shared_libs
+
+LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
+
+include $(TOP)/config/common_make_rules
+
+ifdef SHFLAGS
+shared_libs: $(SHAREDLIBS)
+libflite_LDLIBS = -lm $(AUDIOLIBS)
+libflite_cmulex_LDLIBS = -lflite
+libflite_usenglish_LDLIBS = -lflite
+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_rms_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_slt_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+else
+shared_libs: nothing
+endif
+
+install:
+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
+
Index: flite-1.4-release/main/Makefile
===================================================================
--- flite-1.4-release.orig/main/Makefile
+++ flite-1.4-release/main/Makefile
@@ -54,7 +54,7 @@ VOICELIBS=$(VOICES:%=flite_%)
flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
+flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
include $(TOP)/config/common_make_rules
@@ -67,7 +67,7 @@ VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${P
flite_time_LIBS = flite_cmu_time_awb flite_usenglish flite_cmulex
flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
+flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
$(BINDIR)/t2p$(EXEEXT) \
Index: flite-1.4-release/Makefile
===================================================================
--- flite-1.4-release.orig/Makefile
+++ flite-1.4-release/Makefile
@@ -42,7 +42,7 @@
###########################################################################
TOP=.
DIRNAME=
-BUILD_DIRS = include src lang doc
+BUILD_DIRS = include src lang lib doc
ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm wince windows tools main
CONFIG=configure configure.in config.sub config.guess \
missing install-sh mkinstalldirs
From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001
From: Paul Gevers <elbrus@debian.org>
Date: Tue, 2 Jan 2018 19:58:18 +0100
Subject: [PATCH] Improve internal linking
Building packages in Debian uses a tool to link libraries together at the
package level. It emits warnings when unknonw symbols are found. E.g:
dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries
---
config/common_make_rules | 2 +-
main/Makefile | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/config/common_make_rules b/config/common_make_rules
index 7a03785..34434fd 100644
--- a/config/common_make_rules
+++ b/config/common_make_rules
@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a
@ rm -rf shared_os && mkdir shared_os
@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
+ @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS))
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
@ rm -rf shared_os
diff --git a/main/Makefile b/main/Makefile
index ff422e0..47b6344 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -54,7 +54,8 @@ ALL = shared_libs \
VOICES=$(VOXES)
VOICELIBS=$(VOICES:%=flite_%)
-flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%)
+flite_LIBS = flite $(flite_MODS)
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules
# so make clean can remove them
SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a)
SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so)
+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so
+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lex.so
+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so
VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
$(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
flite_voice_list.c
ifdef SHFLAGS
-flite_LIBS_flags += -Wl,-rpath $(LIBDIR)
+$(SHAREDMODS): $(LIBDIR)/libflite.so
+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite
+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so
+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish
+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so
+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex
+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so
+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang
shared_libs: $(SHAREDLIBS)
else
shared_libs: nothing
--
2.24.1
From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001
From: Alan W Black <awb@cs.cmu.edu>
Date: Sun, 4 Mar 2018 08:55:40 -0500
Subject: [PATCH] get libs in the right order
---
main/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/Makefile b/main/Makefile
index 47b6344..1da18a8 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -55,7 +55,7 @@ VOICES=$(VOXES)
VOICELIBS=$(VOICES:%=flite_%)
flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%)
-flite_LIBS = flite $(flite_MODS)
+flite_LIBS = $(flite_MODS) flite
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
--
2.24.1
From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001
From: Paul Gevers <elbrus@debian.org>
Date: Tue, 2 Jan 2018 06:20:03 +0100
Subject: [PATCH] Only write audio data to a temporariy file in debug builds
This isn't useful in regular builds and is actually a security concern,
although it seems (see discussion in [Bug-Debian]) that this is most likely
only reached during testsuite calls.
CVE-2014-0027
Original patch from Rui Matos <tiagomatos@gmail.com>
Date: Mon, 6 Jan 2014 13:45:00 +0000
Bug-Debian: http://bugs.debian.org/734746
Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678
Source: https://bugzilla.redhat.com/attachment.cgi?id=846118
---
src/audio/auserver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/audio/auserver.c b/src/audio/auserver.c
index 800c27d..cfcad7d 100644
--- a/src/audio/auserver.c
+++ b/src/audio/auserver.c
@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
int q,i,n,r;
unsigned char bytes[CST_AUDIOBUFFSIZE];
short shorts[CST_AUDIOBUFFSIZE];
+#ifdef DEBUG
cst_file fff;
fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY);
+#endif
if ((audio_device = audio_open(header->sample_rate,1,
(header->encoding == CST_SND_SHORT) ?
@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
for (q=r; q > 0; q-=n)
{
n = audio_write(audio_device,shorts,q);
+#ifdef DEBUG
cst_fwrite(fff,shorts,2,q);
+#endif
if (n <= 0)
{
audio_close(audio_device);
@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream)
}
}
audio_close(audio_device);
+#ifdef DEBUG
cst_fclose(fff);
+#endif
return CST_OK_FORMAT;
--
2.24.1
diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c
index e0ae73f..f48ffe6 100644
--- a/lang/cmu_indic_lex/cmu_indic_lex.c
+++ b/lang/cmu_indic_lex/cmu_indic_lex.c
@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char)
return cmu_indic_offset_char[c].type;
}
+int indic_digit_to_offset(const char *ind_digit);
+
static int indic_text_splitable(const char *s,int i,int len1)
{
/* Returns true only if this and next chars are not both digits */
......@@ -18,6 +18,10 @@
<Dependency>alsa-lib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>flite-2.1-prototype.patch</Patch>
<Patch>flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch</Patch>
<Patch>flite-2.1-Improve-internal-linking.patch</Patch>
<Patch>flite-1.4-audio-interface.patch</Patch>
</Patches>
</Source>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment