[arch-commits] Commit in libao/trunk (PKGBUILD ao-pulse-fixes.patch libao.conf)
Jan Steffens
heftig at archlinux.org
Fri Nov 19 19:30:47 UTC 2010
Date: Friday, November 19, 2010 @ 14:30:46
Author: heftig
Revision: 100016
upgpkg: libao 1.0.0-5
Unbreak pulse output, but keep ALSA as default - works well enough. Can't specify multiple default output devices anyway
Added:
libao/trunk/ao-pulse-fixes.patch
Modified:
libao/trunk/PKGBUILD
libao/trunk/libao.conf
----------------------+
PKGBUILD | 12 ++++++++----
ao-pulse-fixes.patch | 28 ++++++++++++++++++++++++++++
libao.conf | 2 +-
3 files changed, 37 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-11-19 19:13:06 UTC (rev 100015)
+++ PKGBUILD 2010-11-19 19:30:46 UTC (rev 100016)
@@ -4,7 +4,7 @@
pkgname=libao
pkgver=1.0.0
-pkgrel=4
+pkgrel=5
pkgdesc="A cross-platform audio output library and plugins"
url="http://www.xiph.org/ao"
arch=('i686' 'x86_64')
@@ -17,13 +17,17 @@
provides=('libao-pulse=$pkgver-$pkgrel')
replaces=('libao-pulse')
source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz"
- 'libao.conf')
+ 'libao.conf' 'ao-pulse-fixes.patch')
md5sums=('08283fbe1f587619053a156254afecec'
- '5c29f3197ccaac2264c89450b4a298d5')
+ '3ae8f3e3f1492210b3519af0f1f3c572'
+ '58eaa3e00e605264ad286f6b161b07e6')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr
+
+ patch -Np0 -i "$srcdir/ao-pulse-fixes.patch"
+
+ ./configure --prefix=/usr --enable-alsa09-mmap --enable-pulseaudio
make
}
Added: ao-pulse-fixes.patch
===================================================================
--- ao-pulse-fixes.patch (rev 0)
+++ ao-pulse-fixes.patch 2010-11-19 19:30:46 UTC (rev 100016)
@@ -0,0 +1,28 @@
+Index: src/plugins/pulse/ao_pulse.c
+===================================================================
+--- src/plugins/pulse/ao_pulse.c (revision 17144)
++++ src/plugins/pulse/ao_pulse.c (working copy)
+@@ -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;
+ }
Modified: libao.conf
===================================================================
--- libao.conf 2010-11-19 19:13:06 UTC (rev 100015)
+++ libao.conf 2010-11-19 19:30:46 UTC (rev 100016)
@@ -1 +1 @@
-default_driver=pulse,alsa
+default_driver=alsa
More information about the arch-commits
mailing list