diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-09-22 11:34:31 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-09-22 11:34:31 +0000 |
| commit | 6616472a0e7d6c33f9fb609acd4057e4eab4c939 (patch) | |
| tree | c33e5ca8f53b8bbec467d587299cb011f14d6f6b /app-accessibility | |
| parent | Import patch for CVE-2012-3524 from Fedora 18. Again, -r0 is for stable and -... (diff) | |
| download | gentoo-2-6616472a0e7d6c33f9fb609acd4057e4eab4c939.tar.gz gentoo-2-6616472a0e7d6c33f9fb609acd4057e4eab4c939.tar.bz2 gentoo-2-6616472a0e7d6c33f9fb609acd4057e4eab4c939.zip | |
Fix undefined reference, #305539 by Diego Elio Pettenò and Michael Palimaka (kensington).
(Portage version: 2.1.11.19/cvs/Linux x86_64)
Diffstat (limited to 'app-accessibility')
| -rw-r--r-- | app-accessibility/flite/ChangeLog | 7 | ||||
| -rw-r--r-- | app-accessibility/flite/files/flite-1.4-audio-interface.patch | 22 | ||||
| -rw-r--r-- | app-accessibility/flite/flite-1.4-r1.ebuild | 17 |
3 files changed, 37 insertions, 9 deletions
diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog index 5d8b1e0a3b65..9e50a2270cf7 100644 --- a/app-accessibility/flite/ChangeLog +++ b/app-accessibility/flite/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-accessibility/flite # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.41 2012/04/13 20:24:43 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.42 2012/09/22 11:34:31 pacho Exp $ + + 22 Sep 2012; Pacho Ramos <pacho@gentoo.org> + +files/flite-1.4-audio-interface.patch, flite-1.4-r1.ebuild: + Fix undefined reference, #305539 by Diego Elio Pettenò and Michael Palimaka + (kensington). 13 Apr 2012; Jesus Rivero <neurogeek@gentoo.org> flite-1.4-r1.ebuild: Added media-libs/alsa-lib as DEPEND and bumped EAPI. Fixes bug #390597 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/flite-1.4-r1.ebuild b/app-accessibility/flite/flite-1.4-r1.ebuild index 5240084e2f7c..5d590eedc730 100644 --- a/app-accessibility/flite/flite-1.4-r1.ebuild +++ b/app-accessibility/flite/flite-1.4-r1.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.4 2012/04/13 20:24:43 neurogeek Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.5 2012/09/22 11:34:31 pacho Exp $ -EAPI="3" - -inherit eutils +EAPI=4 +inherit autotools eutils DESCRIPTION="Flite text to speech engine" HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" @@ -34,9 +33,11 @@ src_prepare() { epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch epatch "${FILESDIR}"/${P}-respect-destdir.patch epatch "${FILESDIR}"/${P}-ldflags.patch + epatch "${FILESDIR}"/${P}-audio-interface.patch sed -i main/Makefile \ -e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ || die + eautoreconf } src_configure() { @@ -45,16 +46,16 @@ src_configure() { myconf=--enable-shared fi myconf="${myconf} --with-audio=$(get_audio)" - econf ${myconf} || die "configuration failed" + econf ${myconf} } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "compilation failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } src_install() { - emake DESTDIR="${D}" install || die "installation failed" - dodoc ACKNOWLEDGEMENTS README || die "Documentation installation failed" + emake DESTDIR="${D}" install + dodoc ACKNOWLEDGEMENTS README if ! use static-libs; then rm -rf "${D}"/usr/lib*/*.a fi |