Update to 1.2.0: 1.2.0 - January 27, 2014 - Added missing ao_file_extension() (see Trac #1841) - Fixed memory leak in ao_shutdown() (see Trac #1799) - Updated manpage libao.conf.5 (see Trac #1822) - Corrected doc/ao_play.html (see Trac #1808) - Latency adjustments - Implement PulseAudio client_name (see Trac #1924) - Other ALSA, Pulse, Roar, sndio and MacOS driver improvementsdiff -r1.34 -r1.35 pkgsrc/audio/libao/Makefile.common
(wiz)
@@ -1,44 +1,45 @@ | @@ -1,44 +1,45 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.34 2012/09/12 00:24:41 asau Exp $ | 1 | # $NetBSD: Makefile.common,v 1.35 2014/02/06 18:37:07 wiz Exp $ | |
2 | # | |||
2 | # used by audio/libao-arts/Makefile | 3 | # used by audio/libao-arts/Makefile | |
3 | # used by audio/libao-esound/Makefile | 4 | # used by audio/libao-esound/Makefile | |
4 | # used by audio/libao-macosx/Makefile | 5 | # used by audio/libao-macosx/Makefile | |
5 | # used by audio/libao-nas/Makefile | 6 | # used by audio/libao-nas/Makefile | |
6 | # used by audio/libao-oss/Makefile | 7 | # used by audio/libao-oss/Makefile | |
7 | # used by audio/libao-sun/Makefile | 8 | # used by audio/libao-sun/Makefile | |
8 | 9 | |||
9 | DISTNAME= libao-1.1.0 | 10 | DISTNAME= libao-1.2.0 | |
10 | CATEGORIES= audio devel | 11 | CATEGORIES= audio devel | |
11 | MASTER_SITES= http://downloads.xiph.org/releases/ao/ | 12 | MASTER_SITES= http://downloads.xiph.org/releases/ao/ | |
12 | 13 | |||
13 | MAINTAINER= pkgsrc-users@NetBSD.org | 14 | MAINTAINER= pkgsrc-users@NetBSD.org | |
14 | HOMEPAGE= http://www.xiph.org/ao/ | 15 | HOMEPAGE= http://www.xiph.org/ao/ | |
15 | COMMENT= Cross-platform audio library | 16 | COMMENT= Cross-platform audio library | |
16 | 17 | |||
17 | DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo | 18 | DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo | |
18 | PATCHDIR= ${.CURDIR}/../../audio/libao/patches | 19 | PATCHDIR= ${.CURDIR}/../../audio/libao/patches | |
19 | 20 | |||
20 | GNU_CONFIGURE= yes | 21 | GNU_CONFIGURE= yes | |
21 | USE_TOOLS+= gmake pkg-config | 22 | USE_TOOLS+= gmake pkg-config | |
22 | USE_LIBTOOL= yes | 23 | USE_LIBTOOL= yes | |
23 | MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} | 24 | MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} | |
24 | MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} | 25 | MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} | |
25 | 26 | |||
26 | PKGCONFIG_OVERRIDE+= ao.pc.in | 27 | PKGCONFIG_OVERRIDE+= ao.pc.in | |
27 | 28 | |||
28 | CONFIGURE_ARGS+= --disable-alsa | 29 | CONFIGURE_ARGS+= --disable-alsa | |
29 | CONFIGURE_ARGS+= --disable-alsa09 | 30 | CONFIGURE_ARGS+= --disable-alsa09 | |
30 | CONFIGURE_ARGS+= --disable-arts | 31 | CONFIGURE_ARGS+= --disable-arts | |
31 | CONFIGURE_ARGS+= --disable-esd | 32 | CONFIGURE_ARGS+= --disable-esd | |
32 | CONFIGURE_ARGS+= --disable-nas | 33 | CONFIGURE_ARGS+= --disable-nas | |
33 | CONFIGURE_ARGS+= --disable-pulse | 34 | CONFIGURE_ARGS+= --disable-pulse | |
34 | CONFIGURE_ARGS+= ENABLE_AIX_AUDIO=no | 35 | CONFIGURE_ARGS+= ENABLE_AIX_AUDIO=no | |
35 | CONFIGURE_ARGS+= ENABLE_IRIX=no | 36 | CONFIGURE_ARGS+= ENABLE_IRIX=no | |
36 | CONFIGURE_ARGS+= ENABLE_OSS=no | 37 | CONFIGURE_ARGS+= ENABLE_OSS=no | |
37 | CONFIGURE_ARGS+= ENABLE_SUN_AUDIO=no | 38 | CONFIGURE_ARGS+= ENABLE_SUN_AUDIO=no | |
38 | CONFIGURE_ARGS+= ENABLE_MACOSX=no | 39 | CONFIGURE_ARGS+= ENABLE_MACOSX=no | |
39 | CONFIGURE_ARGS+= ENABLE_SOLARIS=no | 40 | CONFIGURE_ARGS+= ENABLE_SOLARIS=no | |
40 | 41 | |||
41 | MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl} | 42 | MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl} | |
42 | 43 | |||
43 | .include "../../mk/dlopen.buildlink3.mk" | 44 | .include "../../mk/dlopen.buildlink3.mk" | |
44 | .include "../../mk/oss.buildlink3.mk" | 45 | .include "../../mk/oss.buildlink3.mk" |
@@ -1,45 +1,46 @@ | @@ -1,45 +1,46 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.15 2010/05/19 18:17:27 drochner Exp $ | 1 | @comment $NetBSD: PLIST,v 1.16 2014/02/06 18:37:07 wiz Exp $ | |
2 | include/ao/ao.h | 2 | include/ao/ao.h | |
3 | include/ao/os_types.h | 3 | include/ao/os_types.h | |
4 | include/ao/plugin.h | 4 | include/ao/plugin.h | |
5 | lib/ckport/db/libao.ckport | |||
5 | lib/libao.la | 6 | lib/libao.la | |
6 | lib/pkgconfig/ao.pc | 7 | lib/pkgconfig/ao.pc | |
7 | man/man5/libao.conf.5 | 8 | man/man5/libao.conf.5 | |
8 | share/aclocal/ao.m4 | 9 | share/aclocal/ao.m4 | |
9 | share/doc/${PKGNAME}/ao_append_option.html | 10 | share/doc/${PKGNAME}/ao_append_option.html | |
10 | share/doc/${PKGNAME}/ao_close.html | 11 | share/doc/${PKGNAME}/ao_close.html | |
11 | share/doc/${PKGNAME}/ao_default_driver_id.html | 12 | share/doc/${PKGNAME}/ao_default_driver_id.html | |
12 | share/doc/${PKGNAME}/ao_device.html | 13 | share/doc/${PKGNAME}/ao_device.html | |
13 | share/doc/${PKGNAME}/ao_driver_id.html | 14 | share/doc/${PKGNAME}/ao_driver_id.html | |
14 | share/doc/${PKGNAME}/ao_driver_info.html | 15 | share/doc/${PKGNAME}/ao_driver_info.html | |
15 | share/doc/${PKGNAME}/ao_driver_info_list.html | 16 | share/doc/${PKGNAME}/ao_driver_info_list.html | |
16 | share/doc/${PKGNAME}/ao_example.c | 17 | share/doc/${PKGNAME}/ao_example.c | |
17 | share/doc/${PKGNAME}/ao_file_extension.html | 18 | share/doc/${PKGNAME}/ao_file_extension.html | |
18 | share/doc/${PKGNAME}/ao_free_options.html | 19 | share/doc/${PKGNAME}/ao_free_options.html | |
19 | share/doc/${PKGNAME}/ao_info.html | 20 | share/doc/${PKGNAME}/ao_info.html | |
20 | share/doc/${PKGNAME}/ao_initialize.html | 21 | share/doc/${PKGNAME}/ao_initialize.html | |
21 | share/doc/${PKGNAME}/ao_is_big_endian.html | 22 | share/doc/${PKGNAME}/ao_is_big_endian.html | |
22 | share/doc/${PKGNAME}/ao_open_file.html | 23 | share/doc/${PKGNAME}/ao_open_file.html | |
23 | share/doc/${PKGNAME}/ao_open_live.html | 24 | share/doc/${PKGNAME}/ao_open_live.html | |
24 | share/doc/${PKGNAME}/ao_option.html | 25 | share/doc/${PKGNAME}/ao_option.html | |
25 | share/doc/${PKGNAME}/ao_play.html | 26 | share/doc/${PKGNAME}/ao_play.html | |
26 | share/doc/${PKGNAME}/ao_plugin_close.html | 27 | share/doc/${PKGNAME}/ao_plugin_close.html | |
27 | share/doc/${PKGNAME}/ao_plugin_device_clear.html | 28 | share/doc/${PKGNAME}/ao_plugin_device_clear.html | |
28 | share/doc/${PKGNAME}/ao_plugin_device_init.html | 29 | share/doc/${PKGNAME}/ao_plugin_device_init.html | |
29 | share/doc/${PKGNAME}/ao_plugin_driver_info.html | 30 | share/doc/${PKGNAME}/ao_plugin_driver_info.html | |
30 | share/doc/${PKGNAME}/ao_plugin_file_extension.html | 31 | share/doc/${PKGNAME}/ao_plugin_file_extension.html | |
31 | share/doc/${PKGNAME}/ao_plugin_open.html | 32 | share/doc/${PKGNAME}/ao_plugin_open.html | |
32 | share/doc/${PKGNAME}/ao_plugin_play.html | 33 | share/doc/${PKGNAME}/ao_plugin_play.html | |
33 | share/doc/${PKGNAME}/ao_plugin_set_option.html | 34 | share/doc/${PKGNAME}/ao_plugin_set_option.html | |
34 | share/doc/${PKGNAME}/ao_plugin_test.html | 35 | share/doc/${PKGNAME}/ao_plugin_test.html | |
35 | share/doc/${PKGNAME}/ao_sample_format.html | 36 | share/doc/${PKGNAME}/ao_sample_format.html | |
36 | share/doc/${PKGNAME}/ao_shutdown.html | 37 | share/doc/${PKGNAME}/ao_shutdown.html | |
37 | share/doc/${PKGNAME}/config.html | 38 | share/doc/${PKGNAME}/config.html | |
38 | share/doc/${PKGNAME}/drivers.html | 39 | share/doc/${PKGNAME}/drivers.html | |
39 | share/doc/${PKGNAME}/index.html | 40 | share/doc/${PKGNAME}/index.html | |
40 | share/doc/${PKGNAME}/libao-api.html | 41 | share/doc/${PKGNAME}/libao-api.html | |
41 | share/doc/${PKGNAME}/overview.html | 42 | share/doc/${PKGNAME}/overview.html | |
42 | share/doc/${PKGNAME}/plugin-api.html | 43 | share/doc/${PKGNAME}/plugin-api.html | |
43 | share/doc/${PKGNAME}/plugin-overview.html | 44 | share/doc/${PKGNAME}/plugin-overview.html | |
44 | share/doc/${PKGNAME}/style.css | 45 | share/doc/${PKGNAME}/style.css | |
45 | @pkgdir lib/ao/plugins-4 | 46 | @pkgdir lib/ao/plugins-4 |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.22 2011/04/09 13:20:20 shattered Exp $ | 1 | $NetBSD: distinfo,v 1.23 2014/02/06 18:37:07 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (libao-1.1.0.tar.gz) = 9301bc4886f170c7122ab62677fb71cf001c04fd | 3 | SHA1 (libao-1.2.0.tar.gz) = 6b1d2c6a2e388e3bb6ebea158d51afef18aacc56 | |
4 | RMD160 (libao-1.1.0.tar.gz) = 374078af926bb0744fb2301e128a1c5276fdf4ee | 4 | RMD160 (libao-1.2.0.tar.gz) = 00921bf311f8d7a2be1f860221811924402beebd | |
5 | Size (libao-1.1.0.tar.gz) = 397102 bytes | 5 | Size (libao-1.2.0.tar.gz) = 464596 bytes | |
6 | SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd | 6 | SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd | |
7 | SHA1 (patch-ae) = 55f13b97d76f605cd99d948e3e85ffff44e5546a | 7 | SHA1 (patch-ae) = 55f13b97d76f605cd99d948e3e85ffff44e5546a | |
8 | SHA1 (patch-af) = 33165ac460863f6fa673cde651fbda1f4a83857c | 8 | SHA1 (patch-af) = 6c71ac364615a914771fc4951c6ce7eaf0f02bf1 |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: patch-af,v 1.5 2011/04/09 13:20:21 shattered Exp $ | 1 | $NetBSD: patch-af,v 1.6 2014/02/06 18:37:08 wiz Exp $ | |
2 | 2 | |||
3 | --- src/plugins/alsa/ao_alsa.c.orig 2008-12-18 23:24:28.000000000 -0500 | 3 | --- src/plugins/alsa/ao_alsa.c.orig 2014-01-27 17:02:05.000000000 +0000 | |
4 | +++ src/plugins/alsa/ao_alsa.c | 4 | +++ src/plugins/alsa/ao_alsa.c | |
5 | @@ -39,6 +39,10 @@ | 5 | @@ -39,6 +39,10 @@ | |
6 | #include <alsa/asoundlib.h> | |||
6 | #include <ao/ao.h> | 7 | #include <ao/ao.h> | |
7 | #include <ao/plugin.h> | 8 | #include <ao/plugin.h> | |
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 */ | |||
14 | #define AO_ALSA_BUFFER_TIME 100000 | |||
15 | 13 | |||
14 | /* default 20 millisecond buffer */ | |||
15 | #define AO_ALSA_BUFFER_TIME 20000 |