From 7eb36b1d397353492f753ead05cca91139ff1334 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 5 Jun 2007 06:34:49 +0000 Subject: Correction for the fix for #180312. (Portage version: 2.1.2.9) --- app-accessibility/speech-dispatcher/ChangeLog | 10 ++++- .../files/digest-speech-dispatcher-0.6.2-r1 | 3 -- .../files/digest-speech-dispatcher-0.6.2-r2 | 3 ++ .../speech-dispatcher-0.6.2-espeak-generic.patch | 11 ----- .../files/speech-dispatcher-0.6.2-espeak.patch | 39 ++++++++++++++++- .../speech-dispatcher-0.6.2-r1.ebuild | 48 --------------------- .../speech-dispatcher-0.6.2-r2.ebuild | 49 ++++++++++++++++++++++ 7 files changed, 99 insertions(+), 64 deletions(-) delete mode 100644 app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r1 create mode 100644 app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r2 delete mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak-generic.patch delete mode 100644 app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r1.ebuild create mode 100644 app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r2.ebuild (limited to 'app-accessibility/speech-dispatcher') diff --git a/app-accessibility/speech-dispatcher/ChangeLog b/app-accessibility/speech-dispatcher/ChangeLog index 6815c741dc5a..a3af2539ad24 100644 --- a/app-accessibility/speech-dispatcher/ChangeLog +++ b/app-accessibility/speech-dispatcher/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-accessibility/speech-dispatcher # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.23 2007/06/04 05:17:27 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/ChangeLog,v 1.24 2007/06/05 06:34:49 williamh Exp $ + +*speech-dispatcher-0.6.2-r2 (05 Jun 2007) + + 05 Jun 2007; William Hubbs + files/speech-dispatcher-0.6.2-espeak.patch, + -files/speech-dispatcher-0.6.2-espeak-generic.patch, + -speech-dispatcher-0.6.2-r1.ebuild, +speech-dispatcher-0.6.2-r2.ebuild: + Correction for the fix for #180312. *speech-dispatcher-0.6.2-r1 (04 Jun 2007) diff --git a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r1 b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r1 deleted file mode 100644 index 5491ffa6267e..000000000000 --- a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e8a1d8f5f5a1899f87af4dd3ef9722c8 speech-dispatcher-0.6.2.tar.gz 974300 -RMD160 d0c30282d525c184bc1376e2fa39fd193d133c5f speech-dispatcher-0.6.2.tar.gz 974300 -SHA256 3db16854d65755a76c180271e65a6a29a43cd1f4e5d5eb3ea33b17b0ca58c4ae speech-dispatcher-0.6.2.tar.gz 974300 diff --git a/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r2 b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r2 new file mode 100644 index 000000000000..5491ffa6267e --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/digest-speech-dispatcher-0.6.2-r2 @@ -0,0 +1,3 @@ +MD5 e8a1d8f5f5a1899f87af4dd3ef9722c8 speech-dispatcher-0.6.2.tar.gz 974300 +RMD160 d0c30282d525c184bc1376e2fa39fd193d133c5f speech-dispatcher-0.6.2.tar.gz 974300 +SHA256 3db16854d65755a76c180271e65a6a29a43cd1f4e5d5eb3ea33b17b0ca58c4ae speech-dispatcher-0.6.2.tar.gz 974300 diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak-generic.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak-generic.patch deleted file mode 100644 index 445209e826f8..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak-generic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- speech-dispatcher-0.6.2/config/modules/espeak-generic.conf 2007-06-03 20:57:00.000000000 -0500 -+++ speech-dispatcher-0.6.2/config/modules/espeak-generic.conf 2007-06-03 21:00:32.000000000 -0500 -@@ -20,7 +20,7 @@ - # can modify this value, see other parameters). - # The command can be split into more lines, if necessary, using '\'. - GenericExecuteSynth \ --"echo \"$DATA\" | espeak -w /tmp/espeak.wav -v $VOICE -s $RATE -a $VOLUME -p $PITCH --stdin && aplay /tmp/espeak.wav" -+"echo \"$DATA\" | espeak -w /tmp/espeak.wav -v $VOICE -s $RATE -a 100 -p $PITCH --stdin && aplay /tmp/espeak.wav" - - # GenericStripPunctChars is a list (enclosed in doublequotes) of - # all the characters that should be replaced by whitespaces in diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak.patch index 7c55ae9bc1a2..cb5ccf1fe0a7 100644 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak.patch +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.6.2-espeak.patch @@ -1,4 +1,4 @@ ---- speech-dispatcher-0.6.2/config/speechd.conf.in.orig 2007-04-13 22:13:29.000000000 -0500 +--- speech-dispatcher-0.6.2/config/speechd.conf.in 2007-04-13 22:13:29.000000000 -0500 +++ speech-dispatcher-0.6.2/config/speechd.conf.in 2007-04-13 22:13:48.000000000 -0500 @@ -153,7 +153,7 @@ # DefaultModule selects which output module is the default. @@ -9,3 +9,40 @@ # LanguageDefaultModule selects which output modules are prefered # for specified languages. +--- speech-dispatcher-0.6.2/config/modules/espeak-generic.conf 2007-02-27 10:37:57.000000000 -0600 ++++ speech-dispatcher-0.6.2/config/modules/espeak-generic.conf 2007-06-04 22:54:04.000000000 -0500 +@@ -73,27 +73,27 @@ + # while speechd_rate is a value between -100 (lowest) and +100 (highest) + # You have to define some meaningful conversion for each synthesizer + +-# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.10): ++# Here's the mapping from SSIP (Speech Dispatcher) to ESpeak (v1.25): + # + # SSIP Range SSIP Default ESpeak Range ESpeak Default + # ----------- ------------ ------------ -------------- +-# Rate -100 to 100 0 80 to 320 160 ++# Rate -100 to 100 0 80 to 370 170 + # Pitch -100 to 100 0 0 to 99 50 +-# Volume -100 to 100 0 0 to 20 10 ++# Volume -100 to 100 0 0 to 200 100 + # + # The SSIP defaults are actually controlled via DefaultRate, DefaultPitch, and + # DefaultVolume in the speechd.conf file. + +-GenericRateAdd 160 ++GenericRateAdd 170 + GenericPitchAdd 50 +-GenericVolumeAdd 10 ++GenericVolumeAdd 100 + + # (These values are multiplied by 100, because DotConf currently + # doesn't support floats. So you can write 0.85 as 85 and so on.) + +-GenericRateMultiply 160 ++GenericRateMultiply 170 + GenericPitchMultiply 50 +-GenericVolumeMultiply 10 ++GenericVolumeMultiply 100 + + # If the client program can't handle floats, you will have to + # use these two options to force integers as the parameters diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r1.ebuild deleted file mode 100644 index 0570152ff82b..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r1.ebuild,v 1.1 2007/06/04 05:17:27 williamh Exp $ - -inherit eutils - -DESCRIPTION="speech-dispatcher speech synthesis interface" -HOMEPAGE="http://www.freebsoft.org/speechd" -SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND="app-accessibility/espeak - dev-libs/dotconf - >=dev-libs/glib-2 - media-libs/alsa-lib" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${P}-espeak.patch - epatch ${FILESDIR}/${P}-espeak-generic.patch - epatch ${FILESDIR}/${P}-python.patch -} - -src_compile() { - econf || die "configure failed" - make all || die "make failed" -} - -src_install() { - make DESTDIR=${D} install || die - - newinitd ${FILESDIR}/speech-dispatcher speech-dispatcher - - dodoc AUTHORS ChangeLog NEWS TODO - - insinto /usr/include - doins ${S}/src/c/api/libspeechd.h -} - -pkg_postinst() { - elog "To enable Festival support, you must install app-accessibility/festival-freebsoft-utils." -} diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r2.ebuild new file mode 100644 index 000000000000..3d99c1413f02 --- /dev/null +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-dispatcher/speech-dispatcher-0.6.2-r2.ebuild,v 1.1 2007/06/05 06:34:49 williamh Exp $ + +inherit eutils + +DESCRIPTION="speech-dispatcher speech synthesis interface" +HOMEPAGE="http://www.freebsoft.org/speechd" +SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="app-accessibility/espeak + dev-libs/dotconf + >=dev-libs/glib-2 + media-libs/alsa-lib" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${P}-espeak.patch + epatch ${FILESDIR}/${P}-python.patch +} + +src_compile() { + econf || die "configure failed" + make all || die "make failed" +} + +src_install() { + make DESTDIR=${D} install || die + + newinitd ${FILESDIR}/speech-dispatcher speech-dispatcher + + dodoc AUTHORS ChangeLog NEWS TODO + + insinto /usr/include + doins ${S}/src/c/api/libspeechd.h +} + +pkg_postinst() { + elog "The default synthesizer for speech-dispatcher in gentoo is espeak." + elog "This has been set up in /etc/speech-dispatcher/speechd.conf." + elog "To enable Festival support, you must install app-accessibility/festival-freebsoft-utils." +} -- cgit v1.2.3-65-gdbad