Wed May 19 18:17:27 2010 UTC ()
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.


(drochner)
diff -r1.32 -r1.33 pkgsrc/audio/libao/Makefile
diff -r1.31 -r1.32 pkgsrc/audio/libao/Makefile.common
diff -r1.14 -r1.15 pkgsrc/audio/libao/PLIST
diff -r1.14 -r1.15 pkgsrc/audio/libao/buildlink3.mk
diff -r1.20 -r1.21 pkgsrc/audio/libao/distinfo
diff -r1.8 -r1.9 pkgsrc/audio/libao/patches/patch-ae
diff -r1.3 -r1.4 pkgsrc/audio/libao/patches/patch-af
cvs diff -r1.32 -r1.33 pkgsrc/audio/libao/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libao/Makefile 2007/11/30 17:50:30 1.32
+++ pkgsrc/audio/libao/Makefile 2010/05/19 18:17:27 1.33
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile,v 1.32 2007/11/30 17:50:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2010/05/19 18:17:27 drochner Exp $
2 2
3PKG_INSTALLATION_TYPES= overwrite 3PKG_INSTALLATION_TYPES= overwrite
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7post-install: 7post-install:
8 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-2 8 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-4
9 9
10.include "../../mk/bsd.pkg.mk" 10.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/audio/libao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/audio/libao/Makefile.common 2008/12/18 16:36:11 1.31
+++ pkgsrc/audio/libao/Makefile.common 2010/05/19 18:17:27 1.32
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.common,v 1.31 2008/12/18 16:36:11 jmcneill Exp $ 1# $NetBSD: Makefile.common,v 1.32 2010/05/19 18:17:27 drochner Exp $
2# used by audio/libao-arts/Makefile 2# used by audio/libao-arts/Makefile
3# used by audio/libao-esound/Makefile 3# used by audio/libao-esound/Makefile
4# used by audio/libao-macosx/Makefile 4# used by audio/libao-macosx/Makefile
5# used by audio/libao-nas/Makefile 5# used by audio/libao-nas/Makefile
6# used by audio/libao-oss/Makefile 6# used by audio/libao-oss/Makefile
7# used by audio/libao-sun/Makefile 7# used by audio/libao-sun/Makefile
8 8
9DISTNAME= libao-0.8.8 9DISTNAME= libao-1.0.0
10CATEGORIES= audio devel 10CATEGORIES= audio devel
11MASTER_SITES= http://downloads.xiph.org/releases/ao/ 11MASTER_SITES= http://downloads.xiph.org/releases/ao/
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.xiph.org/ao/ 14HOMEPAGE= http://www.xiph.org/ao/
15COMMENT= Cross-platform audio library 15COMMENT= Cross-platform audio library
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo 19DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
20PATCHDIR= ${.CURDIR}/../../audio/libao/patches 20PATCHDIR= ${.CURDIR}/../../audio/libao/patches
21 21
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
cvs diff -r1.14 -r1.15 pkgsrc/audio/libao/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/libao/PLIST 2009/06/14 18:10:29 1.14
+++ pkgsrc/audio/libao/PLIST 2010/05/19 18:17:27 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:10:29 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.15 2010/05/19 18:17:27 drochner Exp $
2include/ao/ao.h 2include/ao/ao.h
3include/ao/os_types.h 3include/ao/os_types.h
4include/ao/plugin.h 4include/ao/plugin.h
5lib/libao.la 5lib/libao.la
6lib/pkgconfig/ao.pc 6lib/pkgconfig/ao.pc
7man/man5/libao.conf.5 7man/man5/libao.conf.5
8share/aclocal/ao.m4 8share/aclocal/ao.m4
9share/doc/${PKGNAME}/ao_append_option.html 9share/doc/${PKGNAME}/ao_append_option.html
10share/doc/${PKGNAME}/ao_close.html 10share/doc/${PKGNAME}/ao_close.html
11share/doc/${PKGNAME}/ao_default_driver_id.html 11share/doc/${PKGNAME}/ao_default_driver_id.html
12share/doc/${PKGNAME}/ao_device.html 12share/doc/${PKGNAME}/ao_device.html
13share/doc/${PKGNAME}/ao_driver_id.html 13share/doc/${PKGNAME}/ao_driver_id.html
14share/doc/${PKGNAME}/ao_driver_info.html 14share/doc/${PKGNAME}/ao_driver_info.html
@@ -32,14 +32,14 @@ share/doc/${PKGNAME}/ao_plugin_open.html @@ -32,14 +32,14 @@ share/doc/${PKGNAME}/ao_plugin_open.html
32share/doc/${PKGNAME}/ao_plugin_play.html 32share/doc/${PKGNAME}/ao_plugin_play.html
33share/doc/${PKGNAME}/ao_plugin_set_option.html 33share/doc/${PKGNAME}/ao_plugin_set_option.html
34share/doc/${PKGNAME}/ao_plugin_test.html 34share/doc/${PKGNAME}/ao_plugin_test.html
35share/doc/${PKGNAME}/ao_sample_format.html 35share/doc/${PKGNAME}/ao_sample_format.html
36share/doc/${PKGNAME}/ao_shutdown.html 36share/doc/${PKGNAME}/ao_shutdown.html
37share/doc/${PKGNAME}/config.html 37share/doc/${PKGNAME}/config.html
38share/doc/${PKGNAME}/drivers.html 38share/doc/${PKGNAME}/drivers.html
39share/doc/${PKGNAME}/index.html 39share/doc/${PKGNAME}/index.html
40share/doc/${PKGNAME}/libao-api.html 40share/doc/${PKGNAME}/libao-api.html
41share/doc/${PKGNAME}/overview.html 41share/doc/${PKGNAME}/overview.html
42share/doc/${PKGNAME}/plugin-api.html 42share/doc/${PKGNAME}/plugin-api.html
43share/doc/${PKGNAME}/plugin-overview.html 43share/doc/${PKGNAME}/plugin-overview.html
44share/doc/${PKGNAME}/style.css 44share/doc/${PKGNAME}/style.css
45@pkgdir lib/ao/plugins-2 45@pkgdir lib/ao/plugins-4
cvs diff -r1.14 -r1.15 pkgsrc/audio/libao/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/audio/libao/buildlink3.mk 2009/06/14 22:57:58 1.14
+++ pkgsrc/audio/libao/buildlink3.mk 2010/05/19 18:17:27 1.15
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.14 2009/06/14 22:57:58 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2010/05/19 18:17:27 drochner Exp $
2 2
3BUILDLINK_TREE+= libao 3BUILDLINK_TREE+= libao
4 4
5.if !defined(LIBAO_BUILDLINK3_MK) 5.if !defined(LIBAO_BUILDLINK3_MK)
6LIBAO_BUILDLINK3_MK:= 6LIBAO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4 8BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4
9BUILDLINK_ABI_DEPENDS.libao+= libao>=0.8.6nb3 9BUILDLINK_ABI_DEPENDS.libao+= libao>=1.0.0
10BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao 10BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao
11 11
12. if !defined(_LIBAO_BUILDING_PLUGIN) 12. if !defined(_LIBAO_BUILDING_PLUGIN)
13. include "../../mk/bsd.fast.prefs.mk" 13. include "../../mk/bsd.fast.prefs.mk"
14. if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS" 14. if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
15_LIBAO_DEFAULT_PLUGIN= oss 15_LIBAO_DEFAULT_PLUGIN= oss
16. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" 16. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
17_LIBAO_DEFAULT_PLUGIN= sun 17_LIBAO_DEFAULT_PLUGIN= sun
18. else 18. else
19_LIBAO_DEFAULT_PLUGIN= 19_LIBAO_DEFAULT_PLUGIN=
20. endif 20. endif
21 21
22. if !empty(_LIBAO_DEFAULT_PLUGIN) 22. if !empty(_LIBAO_DEFAULT_PLUGIN)
cvs diff -r1.20 -r1.21 pkgsrc/audio/libao/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libao/distinfo 2008/12/19 04:26:56 1.20
+++ pkgsrc/audio/libao/distinfo 2010/05/19 18:17:27 1.21
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.20 2008/12/19 04:26:56 jmcneill Exp $ 1$NetBSD: distinfo,v 1.21 2010/05/19 18:17:27 drochner Exp $
2 2
3SHA1 (libao-0.8.8.tar.gz) = d6e867bbfc4361346db8e505c51271e4162ae7c4 3SHA1 (libao-1.0.0.tar.gz) = 47798bb0fad0c68cd2913ae8c6094aeaa18a23ca
4RMD160 (libao-0.8.8.tar.gz) = 50b9f1e8c22e59ba9fa3d8e635509b8a4a528974 4RMD160 (libao-1.0.0.tar.gz) = 3fa5bfcad9a5d6b09b46b2f32e52a261fe277d27
5Size (libao-0.8.8.tar.gz) = 405619 bytes 5Size (libao-1.0.0.tar.gz) = 394204 bytes
6SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd 6SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd
7SHA1 (patch-ae) = 46e9d0610723714b3d182e15b36103d07095d7d8 7SHA1 (patch-ae) = 55f13b97d76f605cd99d948e3e85ffff44e5546a
8SHA1 (patch-af) = 84458a59cbd4644dbcebf09de73b007c4b1187ba 8SHA1 (patch-af) = 6f2be44b4c0296263fe9b5565c1c21b16a056734
cvs diff -r1.8 -r1.9 pkgsrc/audio/libao/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/audio/libao/patches/Attic/patch-ae 2007/11/30 17:50:32 1.8
+++ pkgsrc/audio/libao/patches/Attic/patch-ae 2010/05/19 18:17:27 1.9
@@ -1,95 +1,81 @@ @@ -1,95 +1,81 @@
1$NetBSD: patch-ae,v 1.8 2007/11/30 17:50:32 wiz Exp $ 1$NetBSD: patch-ae,v 1.9 2010/05/19 18:17:27 drochner Exp $
2 2
3--- configure.orig 2007-05-24 10:51:52.000000000 +0000 3--- configure.orig 2010-03-26 01:24:37.000000000 +0000
4+++ configure 4+++ configure
5@@ -20094,9 +20094,9 @@ else 5@@ -13132,6 +13132,10 @@ else
6 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;; 
7 *-darwin*) 
8 PLUGIN_LDFLAGS="-module -avoid-version" 
9- DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" 
10- CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" 
11- PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;; 
12+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" 
13+ CFLAGS="-D__NO_MATH_INLINES -fsigned-char" 
14+ PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;; 
15 *) 
16 PLUGIN_LDFLAGS="-export-dynamic -avoid-version" 
17 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" 
18@@ -21613,6 +21613,10 @@ else 
19 BUILD_ESD="yes" 6 BUILD_ESD="yes"
20 fi 7 fi
21  8
22+if test "$BUILD_ESD" = "no"; then 9+if test "$BUILD_ESD" = "no"; then
23+ HAVE_ESD_TRUE='#' 10+ HAVE_ESD_TRUE='#'
24+ HAVE_ESD_FALSE= 11+ HAVE_ESD_FALSE=
25+fi; 12+fi;
26  13
27 if test "$BUILD_ESD" = "yes"; then 14 if test "$BUILD_ESD" = "yes"; then
28  15
29@@ -22215,7 +22219,10 @@ else 16@@ -13739,6 +13743,10 @@ else
30 HAVE_OSS_FALSE= 17 HAVE_OSS_FALSE=
31 fi 18 fi
32  19
33- 
34+if test "x${ENABLE_OSS}" = xno; then 20+if test "x${ENABLE_OSS}" = xno; then
35+ HAVE_OSS_TRUE='#' 21+ HAVE_OSS_TRUE='#'
36+ HAVE_OSS_FALSE= 22+ HAVE_OSS_FALSE=
37+fi 23+fi
38  24
39  25
40 # Check whether --enable-alsa was given. 26 have_alsa="no";
41@@ -23007,6 +23014,10 @@ else 27@@ -14304,6 +14312,10 @@ else
42 HAVE_SUN_AUDIO_FALSE= 28 HAVE_SUN_AUDIO_FALSE=
43 fi 29 fi
44  30
45+if test "x${ENABLE_SUN_AUDIO}" = xno; then 31+if test "x${ENABLE_SUN_AUDIO}" = xno; then
46+ HAVE_SUN_AUDIO_TRUE='#' 32+ HAVE_SUN_AUDIO_TRUE='#'
47+ HAVE_SUN_AUDIO_FALSE= 33+ HAVE_SUN_AUDIO_FALSE=
48+fi 34+fi
49  35
50  36
51 case $host in 37 have_sndio="no";
52@@ -23166,6 +23177,10 @@ else 38@@ -14782,6 +14794,10 @@ else
53 HAVE_AIX_AUDIO_FALSE= 39 HAVE_AIX_AUDIO_FALSE=
54 fi 40 fi
55  41
56+if test "x${ENABLE_AIX_AUDIO}" = xno; then 42+if test "x${ENABLE_AIX_AUDIO}" = xno; then
57+ HAVE_AIX_AUDIO_TRUE='#' 43+ HAVE_AIX_AUDIO_TRUE='#'
58+ HAVE_AIX_AUDIO_FALSE= 44+ HAVE_AIX_AUDIO_FALSE=
59+fi 45+fi
60  46
61  47
62 # Check whether --enable-arts was given. 48 # Check whether --enable-arts was given.
63@@ -23424,6 +23439,10 @@ else 49@@ -15145,6 +15161,10 @@ else
64 HAVE_IRIX_FALSE= 50 HAVE_IRIX_FALSE=
65 fi 51 fi
66  52
67+if test "x${ENABLE_IRIX}" = xno; then 53+if test "x${ENABLE_IRIX}" = xno; then
68+ HAVE_IRIX_TRUE='#' 54+ HAVE_IRIX_TRUE='#'
69+ HAVE_IRIX_FALSE= 55+ HAVE_IRIX_FALSE=
70+fi 56+fi
71  57
72  58
73 case $host in 59 case $host in
74@@ -23440,6 +23459,10 @@ else 60@@ -15163,6 +15183,10 @@ else
75 HAVE_MACOSX_FALSE= 61 HAVE_MACOSX_FALSE=
76 fi 62 fi
77  63
78+if test "x${ENABLE_MACOSX}" = xno; then 64+if test "x${ENABLE_MACOSX}" = xno; then
79+ HAVE_MACOSX_TRUE='#' 65+ HAVE_MACOSX_TRUE='#'
80+ HAVE_MACOSX_FALSE= 66+ HAVE_MACOSX_FALSE=
81+fi 67+fi
82  68
83  69
84  70
85@@ -25192,6 +25215,10 @@ else 71@@ -16921,6 +16945,10 @@ else
86 HAVE_SOLARIS_FALSE= 72 HAVE_SOLARIS_FALSE=
87 fi 73 fi
88  74
89+if test "x${ENABLE_SOLARIS}" = xno; then 75+if test "x${ENABLE_SOLARIS}" = xno; then
90+ HAVE_SOLARIS_TRUE='#' 76+ HAVE_SOLARIS_TRUE='#'
91+ HAVE_SOLARIS_FALSE= 77+ HAVE_SOLARIS_FALSE=
92+fi 78+fi
93  79
94  80
95  81
cvs diff -r1.3 -r1.4 pkgsrc/audio/libao/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/audio/libao/patches/Attic/patch-af 2008/12/19 04:26:56 1.3
+++ pkgsrc/audio/libao/patches/Attic/patch-af 2010/05/19 18:17:27 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-af,v 1.3 2008/12/19 04:26:56 jmcneill Exp $ 1$NetBSD: patch-af,v 1.4 2010/05/19 18:17:27 drochner Exp $
2 2
3--- src/plugins/alsa09/ao_alsa09.c.orig 2008-12-18 23:24:28.000000000 -0500 3--- src/plugins/alsa/ao_alsa.c.orig 2008-12-18 23:24:28.000000000 -0500
4+++ src/plugins/alsa09/ao_alsa09.c 4+++ src/plugins/alsa/ao_alsa.c
5@@ -39,6 +39,10 @@ 5@@ -39,6 +39,10 @@
6 #include <ao/ao.h> 6 #include <ao/ao.h>
7 #include <ao/plugin.h> 7 #include <ao/plugin.h>
8  8
9+#ifndef ESTRPIPE 9+#ifndef ESTRPIPE
10+#define ESTRPIPE EPIPE 10+#define ESTRPIPE EPIPE
11+#endif 11+#endif
12+ 12+
13 /* default 500 millisecond buffer */ 13 /* default 500 millisecond buffer */
14 #define AO_ALSA_BUFFER_TIME 500000 14 #define AO_ALSA_BUFFER_TIME 500000
15  15