diff options
Diffstat (limited to 'app-accessibility/flite/files')
5 files changed, 191 insertions, 0 deletions
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch b/app-accessibility/flite/files/flite-1.4-audio-interface.patch new file mode 100644 index 000000000000..bc8d25b89bc3 --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch @@ -0,0 +1,22 @@ +--- configure.in 2009-08-15 06:46:38.000000000 +1000 ++++ configure.in 2011-08-30 00:53:26.000000000 +1000 +@@ -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) diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch new file mode 100644 index 000000000000..270395877c53 --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch @@ -0,0 +1,25 @@ +From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Fri, 1 Jan 2010 12:59:59 -0600 +Subject: [PATCH] fix parallel builds + +--- + main/Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/main/Makefile b/main/Makefile +index 0513e59..e4d04fe 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -81,6 +81,8 @@ else + shared_libs: nothing + endif + ++.NOTPARALLEL: $(ALL) ++ + $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps) + $(TOP)/tools/make_voice_list $(VOICES) + rm -f flite_voice_list.o +-- +1.6.4.4 + diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch new file mode 100644 index 000000000000..f9295fb853b7 --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch @@ -0,0 +1,35 @@ +diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules +--- flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.000000000 +0000 ++++ flite-1.4-release.new/config/common_make_rules 2011-03-26 20:22:59.000000000 +0000 +@@ -68,7 +68,7 @@ + + FLITELIBS = $(BUILDDIR)/lib/libflite.a + FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite +-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) ++LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS) + + FULLOBJS = $(OBJS:%=$(OBJDIR)/%) + ifdef SHFLAGS +@@ -123,7 +123,7 @@ + @ 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) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS)) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) + @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) + @ rm -rf shared_os +--- flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.000000000 +0100 ++++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220 +0000 +@@ -62,9 +62,9 @@ + 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} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS) + $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS) +- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS) ++ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS) + makescripts: + @ cp -p $(SCRIPTS) $(TOP)/bin + diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch new file mode 100644 index 000000000000..d54771423e1f --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch @@ -0,0 +1,59 @@ +From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Thu, 31 Dec 2009 12:57:18 -0600 +Subject: [PATCH] respect destdir + +--- + Makefile | 10 +++++----- + main/Makefile | 10 +++++----- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 2d3ff09..26b2386 100644 +--- a/Makefile ++++ b/Makefile +@@ -106,11 +106,11 @@ tags: + + install: + @echo Installing +- mkdir -p $(INSTALLBINDIR) +- mkdir -p $(INSTALLLIBDIR) +- mkdir -p $(INSTALLINCDIR) +- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) +- @ $(MAKE) -C main --no-print-directory install ++ mkdir -p $(DESTDIR)$(INSTALLBINDIR) ++ mkdir -p $(DESTDIR)$(INSTALLLIBDIR) ++ mkdir -p $(DESTDIR)$(INSTALLINCDIR) ++ $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR) ++ @ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install + + time-stamp : + @ echo $(PROJECT_NAME) >.time-stamp +diff --git a/main/Makefile b/main/Makefile +index 8163e40..0513e59 100644 +--- a/main/Makefile ++++ b/main/Makefile +@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps) + + install: + # The basic binaries +- @ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR) ++ @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR) + @ for i in $(VOICES) ; \ + do \ +- $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \ ++ $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \ + done +- $(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR) ++ $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR) + # The libraries: static and shared (if built) +- cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR) ++ cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR) + ifdef SHFLAGS +- cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR) ++ cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR) + endif + +-- +1.6.4.4 + diff --git a/app-accessibility/flite/files/flite-1.4-tempfile.patch b/app-accessibility/flite/files/flite-1.4-tempfile.patch new file mode 100644 index 000000000000..09b54f64ea2e --- /dev/null +++ b/app-accessibility/flite/files/flite-1.4-tempfile.patch @@ -0,0 +1,50 @@ +From a85193f122b7ec0d377e0a39ac58c64f12c51085 Mon Sep 17 00:00:00 2001 +From: Rui Matos <tiagomatos@gmail.com> +Date: Mon, 6 Jan 2014 13:45:00 +0000 +Subject: [PATCH] auserver.c: Only write audio data to a file in debug builds + +This isn't useful in regular builds and is actually a security +concern. +--- + src/audio/auserver.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/audio/auserver.c b/src/audio/auserver.c +index 29716d3..3e838d0 100644 +--- a/src/audio/auserver.c ++++ b/src/audio/auserver.c +@@ -58,9 +58,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) ? +@@ -107,7 +109,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); +@@ -116,7 +120,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; + +-- +1.8.3.1 + |