update to 1.0.0

changes:
-Added surround channel mapping API and capability
-New config file options
-misc updates and fixes

pkgsrc note: The format structure passed to ao_open_*() has grown a new
member ("matrix", for channel mapping). All client pkgs need to be
checked that it is at least zero-initialized.

7 files changed, 28 insertions, 42 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 1d1b6f01a58..d9ccf41bb09 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2007/11/30 17:50:30 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/05/19 18:17:27 drochner Exp $
 
 PKG_INSTALLATION_TYPES=	overwrite
 
 .include "Makefile.common"
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-2
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index aeb2487f32c..881d87e6f7b 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2008/12/18 16:36:11 jmcneill Exp $
+# $NetBSD: Makefile.common,v 1.32 2010/05/19 18:17:27 drochner Exp $
 # used by audio/libao-arts/Makefile
 # used by audio/libao-esound/Makefile
 # used by audio/libao-macosx/Makefile
@@ -6,7 +6,7 @@
 # used by audio/libao-oss/Makefile
 # used by audio/libao-sun/Makefile
 
-DISTNAME=	libao-0.8.8
+DISTNAME=	libao-1.0.0
 CATEGORIES=	audio devel
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index 82eda089feb..3d6437e062a 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:10:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/05/19 18:17:27 drochner Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
@@ -42,4 +42,4 @@ share/doc/${PKGNAME}/overview.html
 share/doc/${PKGNAME}/plugin-api.html
 share/doc/${PKGNAME}/plugin-overview.html
 share/doc/${PKGNAME}/style.css
-@pkgdir lib/ao/plugins-2
+@pkgdir lib/ao/plugins-4
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index d06bba5c28c..306305bfc16 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:57:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/05/19 18:17:27 drochner Exp $
 
 BUILDLINK_TREE+=	libao
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libao
 LIBAO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libao+=	libao>=0.8.4
-BUILDLINK_ABI_DEPENDS.libao+=	libao>=0.8.6nb3
+BUILDLINK_ABI_DEPENDS.libao+=	libao>=1.0.0
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  if !defined(_LIBAO_BUILDING_PLUGIN)
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index b5b6d7da49a..121cb943ce0 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2008/12/19 04:26:56 jmcneill Exp $
+$NetBSD: distinfo,v 1.21 2010/05/19 18:17:27 drochner Exp $
 
-SHA1 (libao-0.8.8.tar.gz) = d6e867bbfc4361346db8e505c51271e4162ae7c4
-RMD160 (libao-0.8.8.tar.gz) = 50b9f1e8c22e59ba9fa3d8e635509b8a4a528974
-Size (libao-0.8.8.tar.gz) = 405619 bytes
+SHA1 (libao-1.0.0.tar.gz) = 47798bb0fad0c68cd2913ae8c6094aeaa18a23ca
+RMD160 (libao-1.0.0.tar.gz) = 3fa5bfcad9a5d6b09b46b2f32e52a261fe277d27
+Size (libao-1.0.0.tar.gz) = 394204 bytes
 SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd
-SHA1 (patch-ae) = 46e9d0610723714b3d182e15b36103d07095d7d8
-SHA1 (patch-af) = 84458a59cbd4644dbcebf09de73b007c4b1187ba
+SHA1 (patch-ae) = 55f13b97d76f605cd99d948e3e85ffff44e5546a
+SHA1 (patch-af) = 6f2be44b4c0296263fe9b5565c1c21b16a056734
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
index 90c3077c5ac..87f722f0a9b 100644
--- a/audio/libao/patches/patch-ae
+++ b/audio/libao/patches/patch-ae
@@ -1,21 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
+$NetBSD: patch-ae,v 1.9 2010/05/19 18:17:27 drochner Exp $
 
---- configure.orig	2007-05-24 10:51:52.000000000 +0000
+--- configure.orig	2010-03-26 01:24:37.000000000 +0000
 +++ configure
-@@ -20094,9 +20094,9 @@ else
-                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;;
-         *-darwin*)
-                 PLUGIN_LDFLAGS="-module -avoid-version"
--                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
--                CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
--                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
-+                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-+                CFLAGS="-D__NO_MATH_INLINES -fsigned-char"
-+                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
-         *)
-                 PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
-                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-@@ -21613,6 +21613,10 @@ else
+@@ -13132,6 +13132,10 @@ else
     BUILD_ESD="yes"
  fi
  
@@ -26,19 +13,18 @@ $NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
  
  if test "$BUILD_ESD" = "yes"; then
  
-@@ -22215,7 +22219,10 @@ else
+@@ -13739,6 +13743,10 @@ else
    HAVE_OSS_FALSE=
  fi
  
--
 +if test "x${ENABLE_OSS}" = xno; then
 +  HAVE_OSS_TRUE='#'
 +  HAVE_OSS_FALSE=
 +fi
  
  
- # Check whether --enable-alsa was given.
-@@ -23007,6 +23014,10 @@ else
+ have_alsa="no";
+@@ -14304,6 +14312,10 @@ else
    HAVE_SUN_AUDIO_FALSE=
  fi
  
@@ -48,8 +34,8 @@ $NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
 +fi
  
  
- case $host in
-@@ -23166,6 +23177,10 @@ else
+ have_sndio="no";
+@@ -14782,6 +14794,10 @@ else
    HAVE_AIX_AUDIO_FALSE=
  fi
  
@@ -60,7 +46,7 @@ $NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
  
  
  # Check whether --enable-arts was given.
-@@ -23424,6 +23439,10 @@ else
+@@ -15145,6 +15161,10 @@ else
    HAVE_IRIX_FALSE=
  fi
  
@@ -71,7 +57,7 @@ $NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
  
  
  case $host in
-@@ -23440,6 +23459,10 @@ else
+@@ -15163,6 +15183,10 @@ else
    HAVE_MACOSX_FALSE=
  fi
  
@@ -82,7 +68,7 @@ $NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $
  
  
  
-@@ -25192,6 +25215,10 @@ else
+@@ -16921,6 +16945,10 @@ else
    HAVE_SOLARIS_FALSE=
  fi
  
diff --git a/audio/libao/patches/patch-af b/audio/libao/patches/patch-af
index 939b474f99e..3fe695b3bd4 100644
--- a/audio/libao/patches/patch-af
+++ b/audio/libao/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2008/12/19 04:26:56 jmcneill Exp $
+$NetBSD: patch-af,v 1.4 2010/05/19 18:17:27 drochner Exp $
 
---- src/plugins/alsa09/ao_alsa09.c.orig	2008-12-18 23:24:28.000000000 -0500
-+++ src/plugins/alsa09/ao_alsa09.c
+--- src/plugins/alsa/ao_alsa.c.orig	2008-12-18 23:24:28.000000000 -0500
++++ src/plugins/alsa/ao_alsa.c
 @@ -39,6 +39,10 @@
  #include <ao/ao.h>
  #include <ao/plugin.h>