From d4883c607cc43df5c9875957563c4737afc4fff9 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 5 Jul 2014 14:42:07 +0000 Subject: Fix truncation of speech with flite 1.4. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d) --- app-accessibility/eflite/ChangeLog | 9 ++++- app-accessibility/eflite/eflite-0.4.1-r1.ebuild | 46 ---------------------- app-accessibility/eflite/eflite-0.4.1-r2.ebuild | 46 ++++++++++++++++++++++ .../eflite/files/eflite-0.4.1-flite14.patch | 12 ++++++ 4 files changed, 66 insertions(+), 47 deletions(-) delete mode 100644 app-accessibility/eflite/eflite-0.4.1-r1.ebuild create mode 100644 app-accessibility/eflite/eflite-0.4.1-r2.ebuild (limited to 'app-accessibility/eflite') diff --git a/app-accessibility/eflite/ChangeLog b/app-accessibility/eflite/ChangeLog index 8cc52005ffe5..5927207c312c 100644 --- a/app-accessibility/eflite/ChangeLog +++ b/app-accessibility/eflite/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-accessibility/eflite # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.35 2014/07/05 07:26:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.36 2014/07/05 14:42:07 teiresias Exp $ + +*eflite-0.4.1-r2 (05 Jul 2014) + + 05 Jul 2014; Christopher Brannon + -eflite-0.4.1-r1.ebuild, +eflite-0.4.1-r2.ebuild, + files/eflite-0.4.1-flite14.patch: + Fix truncation of speech with flite 1.4. *eflite-0.4.1-r1 (05 Jul 2014) diff --git a/app-accessibility/eflite/eflite-0.4.1-r1.ebuild b/app-accessibility/eflite/eflite-0.4.1-r1.ebuild deleted file mode 100644 index cdbecdbdae5b..000000000000 --- a/app-accessibility/eflite/eflite-0.4.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/eflite-0.4.1-r1.ebuild,v 1.1 2014/07/05 07:26:14 pacho Exp $ - -EAPI="5" -inherit autotools eutils user - -DESCRIPTION="A speech server that allows emacspeak and other screen readers to interact with festival lite." -HOMEPAGE="http://eflite.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="+16k_voice" - -DEPEND=">=app-accessibility/flite-1.4" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' * - epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch - eautoreconf -} - -src_configure() { - local myconf - if use 16k_voice; then - myconf='--with-vox=cmu_us_kal16' - fi - econf ${myconf} -} - -src_install() { - einstall - dodoc ChangeLog README INSTALL eflite_test.txt - - insinto /etc/eflite - doins "${FILESDIR}"/es.conf - - newinitd "${FILESDIR}"/eflite.rc eflite -} - -pkg_postinst() { - enewgroup speech -} diff --git a/app-accessibility/eflite/eflite-0.4.1-r2.ebuild b/app-accessibility/eflite/eflite-0.4.1-r2.ebuild new file mode 100644 index 000000000000..9b156ae99653 --- /dev/null +++ b/app-accessibility/eflite/eflite-0.4.1-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/eflite-0.4.1-r2.ebuild,v 1.1 2014/07/05 14:42:07 teiresias Exp $ + +EAPI="5" +inherit autotools eutils user + +DESCRIPTION="A speech server that allows emacspeak and other screen readers to interact with festival lite." +HOMEPAGE="http://eflite.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="+16k_voice" + +DEPEND=">=app-accessibility/flite-1.4" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' * + epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch + eautoreconf +} + +src_configure() { + local myconf + if use 16k_voice; then + myconf='--with-vox=cmu_us_kal16' + fi + econf ${myconf} +} + +src_install() { + einstall + dodoc ChangeLog README INSTALL eflite_test.txt + + insinto /etc/eflite + doins "${FILESDIR}"/es.conf + + newinitd "${FILESDIR}"/eflite.rc eflite +} + +pkg_postinst() { + enewgroup speech +} diff --git a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch index 4628ca89cca1..cb3096d88a43 100644 --- a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch +++ b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch @@ -10,3 +10,15 @@ diff -Naur eflite-0.4.1/Makefile.in eflite-0.4.1-new/Makefile.in tone.o: tone.c $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $< +diff -Naur eflite-0.4.1/fs.c eflite-0.4.1.new/fs.c +--- eflite-0.4.1/fs.c 2007-01-18 16:01:09.000000000 -0800 ++++ eflite-0.4.1.new/fs.c 2013-09-08 09:31:57.417262688 -0700 +@@ -523,7 +523,7 @@ + int playlen, skip; + if (type == SPEECH) + { +- skip = (187 * wptr->sample_rate) / speed; ++ skip = 0; + playlen = wptr->num_samples - (skip * 2); + if (playlen > 0 && playlen < 500) playlen += (skip * 2) / 3; + } -- cgit v1.2.3-65-gdbad