[arch-commits] Commit in libao/trunk (PKGBUILD ao-pulse-fixes.patch)

[Ray Rashif]

    Date: Wednesday, February 23, 2011 @ 02:11:30
  Author: schiv
Revision: 110917

upgpkg: libao 1.1.0-1
upstream release

Modified:
  libao/trunk/PKGBUILD
Deleted:
  libao/trunk/ao-pulse-fixes.patch

----------------------+
 PKGBUILD             |   28 +++++++++++++++-------------
 ao-pulse-fixes.patch |   28 ----------------------------
 2 files changed, 15 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2011-02-23 06:20:51 UTC (rev 110916)
+++ PKGBUILD    2011-02-23 07:11:30 UTC (rev 110917)
@@ -3,8 +3,8 @@
 # Contributor: dorphell <dorph...@archlinux.org>
 
 pkgname=libao
-pkgver=1.0.0
-pkgrel=5
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="A cross-platform audio output library and plugins"
 url="http://www.xiph.org/ao";
 arch=('i686' 'x86_64')
@@ -17,24 +17,26 @@
 provides=('libao-pulse=$pkgver-$pkgrel')
 replaces=('libao-pulse')
 source=("http://downloads.xiph.org/releases/ao/${pkgname}-${pkgver}.tar.gz";
-        'libao.conf' 'ao-pulse-fixes.patch')
-md5sums=('08283fbe1f587619053a156254afecec'
-         '3ae8f3e3f1492210b3519af0f1f3c572'
-         '58eaa3e00e605264ad286f6b161b07e6')
+        'libao.conf')
+md5sums=('2b2508c29bc97e4dc218fa162cf883c8'
+         '3ae8f3e3f1492210b3519af0f1f3c572')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np0 -i "$srcdir/ao-pulse-fixes.patch"
-
-  ./configure --prefix=/usr --enable-alsa09-mmap --enable-pulseaudio
+  ./configure --prefix=/usr \
+              --enable-alsa09-mmap \
+              --enable-pulseaudio
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-$pkgver"
 
+  make DESTDIR="$pkgdir/" install
+
   # Add conf file
-  install -Dm0644 ${srcdir}/libao.conf ${pkgdir}/etc/libao.conf
+  install -Dm644 "$srcdir/libao.conf" "$pkgdir/etc/libao.conf"
 }
+
+# vim:set ts=2 sw=2 et:

Deleted: ao-pulse-fixes.patch
===================================================================
--- ao-pulse-fixes.patch        2011-02-23 06:20:51 UTC (rev 110916)
+++ ao-pulse-fixes.patch        2011-02-23 07:11:30 UTC (rev 110917)
@@ -1,28 +0,0 @@
-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;
- }