Changes 0.8.5:

* Support now for the ALSA 1.0 API
* ALSA mmap() mode can be enabled/disabled at runtime using "use_mmap" option.
* Patch to OSS plugin to fix skipping issues with some drivers (like emu10k1).
* Can build with --disable-esd option again
* Minor build fixes

7 files changed, 31 insertions, 30 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index b9235d1e293..1cfe13a0f9b 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/16 14:49:13 adam Exp $
 
-PKGREVISION=	1
 PKG_INSTALLATION_TYPES=	overwrite
 
 .include "Makefile.common"
 
-MAINTAINER=	lukem@NetBSD.org
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 3ab3a0a3d06..71383303964 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.13 2004/10/12 14:33:58 tv Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/11/16 14:49:13 adam Exp $
 
-DISTNAME=	libao-0.8.4
+DISTNAME=	libao-0.8.5
 CATEGORIES=	audio devel
 MASTER_SITES=	http://www.xiph.org/ao/src/
 
+MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ao/
 COMMENT=	Cross-platform audio library
 
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index 1808355b9bf..55111e781f9 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/11/16 14:49:13 adam Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
@@ -20,6 +20,7 @@ share/doc/${PKGNAME}/ao_file_extension.html
 share/doc/${PKGNAME}/ao_free_options.html
 share/doc/${PKGNAME}/ao_info.html
 share/doc/${PKGNAME}/ao_initialize.html
+share/doc/${PKGNAME}/ao_is_big_endian.html
 share/doc/${PKGNAME}/ao_open_file.html
 share/doc/${PKGNAME}/ao_open_live.html
 share/doc/${PKGNAME}/ao_option.html
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index b96e37d2109..5e8ea8e78e1 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2004/11/12 01:18:44 hubertf Exp $
+$NetBSD: distinfo,v 1.14 2004/11/16 14:49:13 adam Exp $
 
-SHA1 (libao-0.8.4.tar.gz) = c29e71b5cec430cd29f0af7ee111e314deb22ea5
-Size (libao-0.8.4.tar.gz) = 272670 bytes
+SHA1 (libao-0.8.5.tar.gz) = b7dcceec8a021de2534b26135ce33646634eefd6
+Size (libao-0.8.5.tar.gz) = 267283 bytes
 SHA1 (patch-aa) = 09434b7552954e4dcef0a7d544f7576de6189785
-SHA1 (patch-ab) = 9c7d8764c4e4515d577091b1b29a72266e6af5f7
+SHA1 (patch-ab) = 2a6c89ad7dc170fa5c66b8b9b810e2bf9f1e9288
 SHA1 (patch-ac) = b857f4cc3aa195230ce32f6b466d461016400f65
-SHA1 (patch-ad) = 2b32fec734ed315bc607747f7c7d4db4688f02f8
-SHA1 (patch-ae) = aee20ef1ee26638d067440246ab7f4ab7868ae0b
+SHA1 (patch-ad) = a3332334e24e3808dc38994f6dcce59f960d34a2
+SHA1 (patch-ae) = 051a8a920beee47cfae793815c3fa9a27f7d8b4b
diff --git a/audio/libao/patches/patch-ab b/audio/libao/patches/patch-ab
index 438396f2579..5b2a212ab7a 100644
--- a/audio/libao/patches/patch-ab
+++ b/audio/libao/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2003/12/08 14:33:47 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2004/11/16 14:49:13 adam Exp $
 
---- src/plugins/oss/Makefile.in.orig	Sun Oct  5 03:32:51 2003
+--- src/plugins/oss/Makefile.in.orig	2004-03-19 15:49:37.000000000 +0000
 +++ src/plugins/oss/Makefile.in
-@@ -184,7 +184,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+@@ -129,7 +129,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
 -liboss_la_LIBADD =
 +liboss_la_LIBADD = ${LIBOSSAUDIO}
- am__liboss_la_SOURCES_DIST = ao_oss.c
  @HAVE_OSS_TRUE@am__objects_1 = ao_oss.lo
  @HAVE_OSS_FALSE@am__objects_1 =
+ am_liboss_la_OBJECTS = $(am__objects_1)
diff --git a/audio/libao/patches/patch-ad b/audio/libao/patches/patch-ad
index ac5397650c8..a1952954c4b 100644
--- a/audio/libao/patches/patch-ad
+++ b/audio/libao/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/12/08 14:33:47 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2004/11/16 14:49:13 adam Exp $
 
---- src/Makefile.in.orig	Sun Oct  5 03:32:49 2003
+--- src/Makefile.in.orig	2004-03-19 15:49:36.000000000 +0000
 +++ src/Makefile.in
-@@ -171,7 +171,7 @@ INCLUDES = -I$(top_builddir)/include/ao 
+@@ -117,7 +117,7 @@ INCLUDES = -I$(top_builddir)/include/ao 
  lib_LTLIBRARIES = libao.la
  
  libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h
diff --git a/audio/libao/patches/patch-ae b/audio/libao/patches/patch-ae
index c3e4b14764e..afd74f3535e 100644
--- a/audio/libao/patches/patch-ae
+++ b/audio/libao/patches/patch-ae
@@ -1,6 +1,8 @@
---- configure.orig	Sun Oct  5 03:32:52 2003
-+++ configure	Thu Nov 11 16:34:34 2004
-@@ -7834,9 +7834,9 @@
+$NetBSD: patch-ae,v 1.5 2004/11/16 14:49:13 adam Exp $
+
+--- configure.orig	2004-03-19 15:49:41.000000000 +0000
++++ configure
+@@ -8081,9 +8081,9 @@ else
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
          *-darwin*)
                  PLUGIN_LDFLAGS="-module -avoid-version"
@@ -13,15 +15,15 @@
          *)
                  PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
                  DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
-@@ -9072,6 +9072,11 @@
-    BUILD_ESD="$enableval"
- else
+@@ -9490,6 +9490,11 @@ else
     BUILD_ESD="yes"
-+fi;
-+
+ fi;
+ 
 +if test "$BUILD_ESD" = "no"; then
 +  HAVE_ESD_TRUE='#'
 +  HAVE_ESD_FALSE=
- fi;
- 
++fi;
++
  if test "$BUILD_ESD" = "yes"; then
+ 
+ # Check whether --with-esd-prefix or --without-esd-prefix was given.