Update alsa packages to 1.0.21.

http://www.alsa-project.org/main/index.php/Changes_v1.0.18_v1.0.19
http://www.alsa-project.org/main/index.php/Changes_v1.0.19_v1.0.20
http://www.alsa-project.org/main/index.php/Changes_v1.0.20_v1.0.21
contain ~300kB of changes.

9 files changed, 38 insertions, 23 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 04ecb69e2b9..62eb0fae2f0 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/01/28 05:38:53 obache Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/31 14:25:49 wiz Exp $
 #
 
-DISTNAME=	alsa-lib-1.0.18
+DISTNAME=	alsa-lib-1.0.21
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-lib/PLIST b/audio/alsa-lib/PLIST
index 8e36195cfae..187aceed7ae 100644
--- a/audio/alsa-lib/PLIST
+++ b/audio/alsa-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/08/31 14:25:49 wiz Exp $
 bin/aserver
 include/alsa/alisp.h
 include/alsa/asoundef.h
@@ -81,6 +81,7 @@ share/alsa/cards/PMacToonie.conf
 share/alsa/cards/PS3.conf
 share/alsa/cards/RME9636.conf
 share/alsa/cards/RME9652.conf
+share/alsa/cards/SB-XFi.conf
 share/alsa/cards/SI7018.conf
 share/alsa/cards/SI7018/sndoc-mixer.alisp
 share/alsa/cards/SI7018/sndop-mixer.alisp
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index c6e99cd0ca6..cac2963ca65 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/01/28 05:40:11 obache Exp $
+$NetBSD: distinfo,v 1.6 2009/08/31 14:25:49 wiz Exp $
 
-SHA1 (alsa-lib-1.0.18.tar.bz2) = 54e6916738e479a0eec7e9f4715c22efee4d8594
-RMD160 (alsa-lib-1.0.18.tar.bz2) = 88a7a5ce6133704d100f034b9e08e9ffdf0627d9
-Size (alsa-lib-1.0.18.tar.bz2) = 790052 bytes
+SHA1 (alsa-lib-1.0.21.tar.bz2) = cac69df85692ac407c4c80e7ca7a016ee8f35918
+RMD160 (alsa-lib-1.0.21.tar.bz2) = b92732e73d5d2934d3ab627d62a2439519446a61
+Size (alsa-lib-1.0.21.tar.bz2) = 808252 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
 SHA1 (patch-ab) = d6082e1291992699de86e6f78bf43f4cb476c0c8
 SHA1 (patch-ac) = 2ddf533a998f0c1ee8444e97e401bde1fad344ac
@@ -18,7 +18,7 @@ SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
 SHA1 (patch-am) = e028c544894720fbe585b938715a4ac01fb5600e
 SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
 SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
-SHA1 (patch-ap) = 93fba4a9f739727c009bef1716b9138be1a03ca6
+SHA1 (patch-ap) = 7fcd495dc6f9a3974580a99523de4638c383a940
 SHA1 (patch-aq) = 0e700c7e544fb6245e738a3d2356921484c55242
 SHA1 (patch-ar) = b8ae2c11cc075e5e31766c87c7f805d8202aa9e4
 SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
diff --git a/audio/alsa-lib/patches/patch-ap b/audio/alsa-lib/patches/patch-ap
index f67950b8dd1..9b08eec7a78 100644
--- a/audio/alsa-lib/patches/patch-ap
+++ b/audio/alsa-lib/patches/patch-ap
@@ -1,6 +1,6 @@
-$NetBSD: patch-ap,v 1.2 2008/12/25 13:18:00 hasso Exp $
+$NetBSD: patch-ap,v 1.3 2009/08/31 14:25:49 wiz Exp $
 
---- src/pcm/pcm_file.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_file.c.orig	2009-05-06 07:07:23.000000000 +0000
 +++ src/pcm/pcm_file.c
 @@ -26,8 +26,10 @@
   *
@@ -11,5 +11,5 @@ $NetBSD: patch-ap,v 1.2 2008/12/25 13:18:00 hasso Exp $
  #include <byteswap.h>
 +#endif
  #include <ctype.h>
+ #include <string.h>
  #include "pcm_local.h"
- #include "pcm_plugin.h"
diff --git a/audio/alsa-plugins-oss/Makefile b/audio/alsa-plugins-oss/Makefile
index 04c856ed511..7d1713d9806 100644
--- a/audio/alsa-plugins-oss/Makefile
+++ b/audio/alsa-plugins-oss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/07/07 14:45:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/31 14:25:49 wiz Exp $
 #
 
-DISTNAME=	alsa-plugins-1.0.18
+DISTNAME=	alsa-plugins-1.0.21
 PKGNAME=	${DISTNAME:S/plugins/plugins-oss/}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
diff --git a/audio/alsa-plugins-oss/distinfo b/audio/alsa-plugins-oss/distinfo
index 6ef5a024b79..1de8f85b830 100644
--- a/audio/alsa-plugins-oss/distinfo
+++ b/audio/alsa-plugins-oss/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/07/07 14:45:41 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/08/31 14:25:49 wiz Exp $
 
-SHA1 (alsa-plugins-1.0.18.tar.bz2) = 33b5eca861de35a6eeb47862f24a8663af56cd0a
-RMD160 (alsa-plugins-1.0.18.tar.bz2) = 83b570d5346c7c79f5fe628e381ba1cf8e5a69db
-Size (alsa-plugins-1.0.18.tar.bz2) = 312656 bytes
+SHA1 (alsa-plugins-1.0.21.tar.bz2) = dae6f4dd4aa8638aded472cf503eb2c2e5f69730
+RMD160 (alsa-plugins-1.0.21.tar.bz2) = 853416f1c78c9c2b99ba5f2ed0c36df88f21a387
+Size (alsa-plugins-1.0.21.tar.bz2) = 325828 bytes
 SHA1 (patch-aa) = 77774e607905f3930ffec503c04d6dd1f70d9946
 SHA1 (patch-ab) = 9cf0bda9f1928f46d0d5eac9464b790710ea2fda
 SHA1 (patch-ac) = 13da103ce3daad29d3c715f8f7d58dcd7bb9a72c
diff --git a/audio/alsa-plugins-pulse/Makefile b/audio/alsa-plugins-pulse/Makefile
index 8b3827b9c55..2254f2dbf1a 100644
--- a/audio/alsa-plugins-pulse/Makefile
+++ b/audio/alsa-plugins-pulse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/07/07 14:59:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/31 14:25:49 wiz Exp $
 #
 
-DISTNAME=	alsa-plugins-1.0.18
+DISTNAME=	alsa-plugins-1.0.21
 PKGNAME=	${DISTNAME:S/plugins/plugins-pulse/}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
diff --git a/audio/alsa-plugins-pulse/distinfo b/audio/alsa-plugins-pulse/distinfo
index 8731fa961c0..e4ac22f515c 100644
--- a/audio/alsa-plugins-pulse/distinfo
+++ b/audio/alsa-plugins-pulse/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/07/07 14:59:00 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/08/31 14:25:49 wiz Exp $
 
-SHA1 (alsa-plugins-1.0.18.tar.bz2) = 33b5eca861de35a6eeb47862f24a8663af56cd0a
-RMD160 (alsa-plugins-1.0.18.tar.bz2) = 83b570d5346c7c79f5fe628e381ba1cf8e5a69db
-Size (alsa-plugins-1.0.18.tar.bz2) = 312656 bytes
+SHA1 (alsa-plugins-1.0.21.tar.bz2) = dae6f4dd4aa8638aded472cf503eb2c2e5f69730
+RMD160 (alsa-plugins-1.0.21.tar.bz2) = 853416f1c78c9c2b99ba5f2ed0c36df88f21a387
+Size (alsa-plugins-1.0.21.tar.bz2) = 325828 bytes
 SHA1 (patch-aa) = 77774e607905f3930ffec503c04d6dd1f70d9946
+SHA1 (patch-ab) = e921a2a20705c0d235f27f6bc261f3472a0e3b0d
diff --git a/audio/alsa-plugins-pulse/patches/patch-ab b/audio/alsa-plugins-pulse/patches/patch-ab
new file mode 100644
index 00000000000..cca6295a18d
--- /dev/null
+++ b/audio/alsa-plugins-pulse/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/08/31 14:25:49 wiz Exp $
+
+--- pulse/pulse.h.orig	2009-08-31 13:09:41.000000000 +0000
++++ pulse/pulse.h
+@@ -46,3 +46,8 @@ int pulse_connect(snd_pulse_t * p, const
+ 
+ void pulse_poll_activate(snd_pulse_t * p);
+ void pulse_poll_deactivate(snd_pulse_t * p);
++
++#include <errno.h>
++#ifndef EBADFD
++#define EBADFD EIO
++#endif