Update to 1.0.22:

 Core

   Release v1.0.22

 ALSA Control (alsactl)

   alsactl: fix error path code in init_parse.c
   alsactl: init - default - initialize also "Digital Input Source"
   alsactl init: Add CTL{do_search} and CTL{do_count} parsers
   alsactl init: use empty GOTOs in init/default file to increase readability
   alsactl: introduce CTL{write} to match directly written CTL values
   alsactl - Initialize Speaker volume to 0dB when Master is present
   alsactl init: Fix typo "(" -> "{" in Headphone default rule

 Speaker Test

   speaker-test: not all sample formats are supported - show only
   supported ones
   speaker-test: add -d (--debug) option to show PCM parameters

 aplay/arecord

   arecord: fix wrong chunk_size initialization when verbose and
   mmap flags are set
   aplay - Show available formats

4 files changed, 14 insertions, 21 deletions

diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 141a3fb86b3..ac2ee81931a 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/08/31 14:31:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/16 18:28:01 wiz Exp $
 #
 
-DISTNAME=	alsa-utils-1.0.20
+DISTNAME=	alsa-utils-1.0.22
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo
index 5ba445978b5..fe824905b0a 100644
--- a/audio/alsa-utils/distinfo
+++ b/audio/alsa-utils/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2009/08/31 14:31:00 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/02/16 18:28:01 wiz Exp $
 
-SHA1 (alsa-utils-1.0.20.tar.bz2) = 14364394d1eaff5b5719c6be834de1311c83475e
-RMD160 (alsa-utils-1.0.20.tar.bz2) = f8e8f036caa2a687c2768b19fddb4c973aafe152
-Size (alsa-utils-1.0.20.tar.bz2) = 1044483 bytes
-SHA1 (patch-aa) = b3dcc338045b95fd5e531428af4253d356f59944
+SHA1 (alsa-utils-1.0.22.tar.bz2) = 3587dc19d9a60ab9bb2bfe2d23491230eae99fe1
+RMD160 (alsa-utils-1.0.22.tar.bz2) = f9f9c3cc81e9c0d97fd62c3f91424a8f117ca6c3
+Size (alsa-utils-1.0.22.tar.bz2) = 1075216 bytes
+SHA1 (patch-aa) = d44e1fb7a27a8002425c90ce00e5f5970e1a1265
 SHA1 (patch-ab) = b899128edb57bdb3a8b8186b6dd69182a7c1932f
 SHA1 (patch-ac) = 613414c9683255e1a9ed6c32187a220b151beea2
-SHA1 (patch-ad) = 2e6863b262083de14a7147f035dbf2e37bc47765
+SHA1 (patch-ad) = 0c287dba62636778edab76d977f230626803e5ba
diff --git a/audio/alsa-utils/patches/patch-aa b/audio/alsa-utils/patches/patch-aa
index 7abaca21dc1..94c101b84d1 100644
--- a/audio/alsa-utils/patches/patch-aa
+++ b/audio/alsa-utils/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/16 18:28:01 wiz Exp $
 
 --- configure.orig	2008-10-29 08:48:06.000000000 -0400
 +++ configure
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $
  LIBS="$ALSA_LIBS $LIBS"
  { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
  echo "${ECHO_T}$ALSA_LIBS" >&6; }
-@@ -9042,6 +9042,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;
diff --git a/audio/alsa-utils/patches/patch-ad b/audio/alsa-utils/patches/patch-ad
index dcf38e00a49..572ad07b6dd 100644
--- a/audio/alsa-utils/patches/patch-ad
+++ b/audio/alsa-utils/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2009/08/31 14:31:00 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2010/02/16 18:28:01 wiz Exp $
 
---- speaker-test/speaker-test.c.orig	2009-05-06 07:07:24.000000000 +0000
+--- speaker-test/speaker-test.c.orig	2009-12-16 15:18:52.000000000 +0000
 +++ speaker-test/speaker-test.c
-@@ -44,7 +44,12 @@
+@@ -44,7 +44,14 @@
  #include <getopt.h>
  #include <inttypes.h>
  #include <ctype.h>
 +#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
++#define bswap_16 bswap16
++#define bswap_32 bswap32
 +#define ESTRPIPE EPIPE
 +#else
  #include <byteswap.h>