Fix pulseaudio module wrt #329737 by Reuben Martin. Remove -O20 from upstream default CFLAGS.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 81 insertions, 1 deletions

diff --git a/media-libs/libao/ChangeLog b/media-libs/libao/ChangeLog
index 967688627f18..fedef50d29e4 100644
--- a/media-libs/libao/ChangeLog
+++ b/media-libs/libao/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libao
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.92 2010/07/25 15:30:09 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/ChangeLog,v 1.93 2010/07/26 08:06:02 ssuominen Exp $
+
+*libao-1.0.0-r1 (26 Jul 2010)
+
+  26 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +libao-1.0.0-r1.ebuild, +files/libao-1.0.0-pulseaudio.patch:
+  Fix pulseaudio module wrt #329737 by Reuben Martin. Remove -O20 from
+  upstream default CFLAGS.
 
   25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> libao-1.0.0.ebuild:
   Stable on alpha, bug #324265
diff --git a/media-libs/libao/files/libao-1.0.0-pulseaudio.patch b/media-libs/libao/files/libao-1.0.0-pulseaudio.patch
new file mode 100644
index 000000000000..81df2fcc12c4
--- /dev/null
+++ b/media-libs/libao/files/libao-1.0.0-pulseaudio.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/329737
+http://trac.xiph.org/ticket/1689
+
+--- src/plugins/pulse/ao_pulse.c
++++ src/plugins/pulse/ao_pulse.c
+@@ -227,7 +227,7 @@
+     }
+ 
+ 
+-    if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, &map, NULL, NULL)))
++    if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, device->input_map ? &map : NULL, NULL, NULL)))
+         return 0;
+ 
+     device->driver_byte_format = AO_FMT_NATIVE;
+@@ -247,9 +247,11 @@
+     assert(device && device->internal);
+     ao_pulse_internal *internal = (ao_pulse_internal *) device->internal;
+ 
+-    pa_simple_drain(internal->simple, NULL);
+-    pa_simple_free(internal->simple);
+-    internal->simple = NULL;
++    if (internal->simple) {
++        pa_simple_drain(internal->simple, NULL);
++        pa_simple_free(internal->simple);
++        internal->simple = NULL;
++    }
+ 
+     return 1;
+ }
diff --git a/media-libs/libao/libao-1.0.0-r1.ebuild b/media-libs/libao/libao-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..31aa7e9e4f92
--- /dev/null
+++ b/media-libs/libao/libao-1.0.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libao/libao-1.0.0-r1.ebuild,v 1.1 2010/07/26 08:06:02 ssuominen Exp $
+
+EAPI=2
+inherit eutils libtool
+
+DESCRIPTION="the audio output library"
+HOMEPAGE="http://www.xiph.org/ao/"
+SRC_URI="http://downloads.xiph.org/releases/ao/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="alsa nas mmap pulseaudio static-libs"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pulseaudio.patch
+	sed -i -e 's:-O20::' configure || die
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		--disable-esd \
+		$(use_enable alsa alsa) \
+		$(use_enable mmap alsa-mmap) \
+		--disable-arts \
+		$(use_enable nas) \
+		$(use_enable pulseaudio pulse)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS CHANGES README TODO
+}