update from libao 0.7.0 to libao 0.8.0

NOTE: api has changed (different major number on library). all other
libao packages need updating as well

changes:
* New API is not compatible with programs that used the old API.
* Default driver detection works correctly.
* Compilation fixes for the BSDs and Solaris.
* OSS driver no longer freezes on systems using the OSS emulation
layer of ALSA when the dsp device is in use by another device.
* Configuration file support has been added.  See the libao.conf(5)
man page for details.

7 files changed, 63 insertions, 55 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 8efecb30eff..ef520c97f73 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2001/08/08 09:18:28 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/14 14:33:29 lukem Exp $
 
-DISTNAME=	libao-0.7.0
+DISTNAME=	libao-0.8.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.vorbis.com/files/rc1/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc2/unix/
 
-MAINTAINER=	reed@reedmedia.net
+MAINTAINER=	lukem@netbsd.org
 COMMENT=	cross-platform audio library
 
 BUILD_DEPENDS+=	automake-1.4:../../devel/automake
diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk
index 9ee99485f86..a9a0448be17 100644
--- a/audio/libao/buildlink.mk
+++ b/audio/libao/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/08/08 09:18:28 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/08/14 14:33:30 lukem Exp $
 #
 # This Makefile fragment is included by packages that use libao.
 #
@@ -17,7 +17,7 @@ LIGAO_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libao?=	libao>=0.7.0
+BUILDLINK_DEPENDS.libao?=	libao>=0.8.0
 DEPENDS+=		${BUILDLINK_DEPENDS.libao}:../../audio/libao
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libao=libao
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index e644179ea61..e6301a61ed8 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/08/08 09:18:28 lukem Exp $
+$NetBSD: distinfo,v 1.5 2001/08/14 14:33:30 lukem Exp $
 
-SHA1 (libao-0.7.0.tar.gz) = d092ba9cb7868561b6b40515196e5beae077f55b
-Size (libao-0.7.0.tar.gz) = 141761 bytes
-SHA1 (patch-ab) = 5f433ac5bf7ff65f02c5aa33faf6b8e28d84e53e
-SHA1 (patch-ac) = c9c77903ff355b7dcef5476d3779234c4bd82e42
+SHA1 (libao-0.8.0.tar.gz) = 8685296e82724f70f5069e47a693693a90ccf59f
+Size (libao-0.8.0.tar.gz) = 158390 bytes
+SHA1 (patch-aa) = 1f5b0193d602b51e2a1befe5d08fcb576dfa46b9
diff --git a/audio/libao/patches/patch-aa b/audio/libao/patches/patch-aa
new file mode 100644
index 00000000000..0143ad1373a
--- /dev/null
+++ b/audio/libao/patches/patch-aa
@@ -0,0 +1,13 @@
+--- src/plugins/oss/ao_oss.c.orig	Mon Aug 13 16:20:05 2001
++++ src/plugins/oss/ao_oss.c	Wed Aug 15 00:15:59 2001
+@@ -81,8 +81,8 @@
+ 	char *err = NULL;
+ 	char *dev = NULL;
+ 
+-	/* default: first try the devfs path */
+-	*dev_path = strdup("/dev/sound/dsp");
++	/* default: first try the NetBSD path */
++	*dev_path = strdup("/dev/sound");
+ 	fd = open(*dev_path, O_WRONLY | O_NONBLOCK);
+ 
+ 	/* then try the original dsp path */
diff --git a/audio/libao/patches/patch-ab b/audio/libao/patches/patch-ab
deleted file mode 100644
index c22b9e37336..00000000000
--- a/audio/libao/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/05/12 21:26:40 mycroft Exp $
-
---- ../libao-0.6.0.orig/src/plugins/oss/ao_oss.c	Fri Feb 23 17:31:48 2001
-+++ src/plugins/oss/ao_oss.c	Wed Mar 14 22:12:22 2001
-@@ -113,7 +113,7 @@
- 		}
- 	} else {
- 		/* default: first try the devfs path */
--		state->dev = strdup("/dev/sound/dsp");
-+		state->dev = strdup("/dev/sound");
- 		state->fd=open(state->dev,O_WRONLY);
- 		if(state->fd < 0) 
- 		{
-@@ -198,7 +198,7 @@
- int plugin_get_latency(ao_internal_t *state)
- {
- 	int odelay = 0;
--	ioctl(((ao_oss_internal_t *)state)->fd, SNDCTL_DSP_GETODELAY, &odelay);
-+/*	ioctl(((ao_oss_internal_t *)state)->fd, SNDCTL_DSP_GETODELAY, &odelay); */
- 	return odelay;
- }
- 
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
deleted file mode 100644
index 517e79c2798..00000000000
--- a/audio/libao/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/15 20:35:58 wiz Exp $
-
---- ../libao-0.6.0.orig/src/audio_out.c	Fri Feb 23 17:31:46 2001
-+++ src/audio_out.c	Thu Mar 15 10:21:55 2001
-@@ -63,7 +63,7 @@
- 	driver_tree_t *dt;
- 	void *handle;
- 	
--	handle = dlopen(plugin_file, RTLD_NOW);
-+	handle = dlopen(plugin_file, DL_LAZY);
- 	if (handle) {
- 		dt = (driver_tree_t *)malloc(sizeof(driver_tree_t));
- 		if (!dt) return NULL;
diff --git a/audio/libao/pkg/PLIST b/audio/libao/pkg/PLIST
index 59963d453f3..6d0622689d6 100644
--- a/audio/libao/pkg/PLIST
+++ b/audio/libao/pkg/PLIST
@@ -1,19 +1,50 @@
-@comment $NetBSD: PLIST,v 1.4 2001/08/08 09:18:30 lukem Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/08/14 14:33:33 lukem Exp $
 include/ao/ao.h
 include/ao/os_types.h
+include/ao/plugin.h
 lib/ao/libsun.a
 lib/ao/libsun.la
 lib/ao/libsun.so
 lib/libao.a
 lib/libao.la
 lib/libao.so
-lib/libao.so.1
-lib/libao.so.1.1
+lib/libao.so.2
+lib/libao.so.2.1
+man/man5/libao.conf.5
 share/aclocal/ao.m4
-share/doc/${PKGNAME}/API
-share/doc/${PKGNAME}/DRIVERS
-share/doc/${PKGNAME}/USAGE
-share/doc/${PKGNAME}/WANTED
-@dirrm include/ao
-@dirrm lib/ao
+share/doc/${PKGNAME}/ao_append_option.html
+share/doc/${PKGNAME}/ao_close.html
+share/doc/${PKGNAME}/ao_default_driver_id.html
+share/doc/${PKGNAME}/ao_device.html
+share/doc/${PKGNAME}/ao_driver_id.html
+share/doc/${PKGNAME}/ao_driver_info.html
+share/doc/${PKGNAME}/ao_driver_info_list.html
+share/doc/${PKGNAME}/ao_example.c
+share/doc/${PKGNAME}/ao_free_options.html
+share/doc/${PKGNAME}/ao_info.html
+share/doc/${PKGNAME}/ao_initialize.html
+share/doc/${PKGNAME}/ao_open_file.html
+share/doc/${PKGNAME}/ao_open_live.html
+share/doc/${PKGNAME}/ao_option.html
+share/doc/${PKGNAME}/ao_play.html
+share/doc/${PKGNAME}/ao_plugin_close.html
+share/doc/${PKGNAME}/ao_plugin_device_clear.html
+share/doc/${PKGNAME}/ao_plugin_device_init.html
+share/doc/${PKGNAME}/ao_plugin_driver_info.html
+share/doc/${PKGNAME}/ao_plugin_open.html
+share/doc/${PKGNAME}/ao_plugin_play.html
+share/doc/${PKGNAME}/ao_plugin_set_option.html
+share/doc/${PKGNAME}/ao_plugin_test.html
+share/doc/${PKGNAME}/ao_sample_format.html
+share/doc/${PKGNAME}/ao_shutdown.html
+share/doc/${PKGNAME}/config.html
+share/doc/${PKGNAME}/drivers.html
+share/doc/${PKGNAME}/index.html
+share/doc/${PKGNAME}/libao-api.html
+share/doc/${PKGNAME}/overview.html
+share/doc/${PKGNAME}/plugin-api.html
+share/doc/${PKGNAME}/plugin-overview.html
+share/doc/${PKGNAME}/style.css
 @dirrm share/doc/${PKGNAME}
+@dirrm lib/ao
+@dirrm include/ao