From a19c966287ece52d1328c02e6df209b0387d8c23 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 19 May 2010 18:22:14 +0000 Subject: zero-initialize format specifier for libao, bump PKGREVISION --- audio/mpg321/Makefile | 4 ++-- audio/mpg321/distinfo | 3 ++- audio/mpg321/patches/patch-ab | 12 ++++++++++++ audio/musicpd/Makefile | 3 ++- audio/musicpd/distinfo | 3 ++- audio/musicpd/patches/patch-ac | 12 ++++++++++++ audio/tremor-tools/Makefile | 4 ++-- audio/tremor-tools/distinfo | 3 ++- audio/tremor-tools/patches/patch-ai | 12 ++++++++++++ audio/vorbis-tools/Makefile | 4 ++-- audio/vorbis-tools/distinfo | 3 ++- audio/vorbis-tools/patches/patch-ae | 12 ++++++++++++ 12 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 audio/mpg321/patches/patch-ab create mode 100644 audio/musicpd/patches/patch-ac create mode 100644 audio/tremor-tools/patches/patch-ai create mode 100644 audio/vorbis-tools/patches/patch-ae (limited to 'audio') diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile index 2bb45d1eb5e..48c3b74f1c7 100644 --- a/audio/mpg321/Makefile +++ b/audio/mpg321/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2008/01/06 12:41:11 heinz Exp $ +# $NetBSD: Makefile,v 1.14 2010/05/19 18:25:19 drochner Exp $ DISTNAME= mpg321-0.2.10 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg321/} diff --git a/audio/mpg321/distinfo b/audio/mpg321/distinfo index 2424b728a84..81425a10c0b 100644 --- a/audio/mpg321/distinfo +++ b/audio/mpg321/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2007/08/13 06:31:37 rillig Exp $ +$NetBSD: distinfo,v 1.5 2010/05/19 18:25:19 drochner Exp $ SHA1 (mpg321-0.2.10.tar.gz) = 90268d0d187ddd7625d143b95791cb39a1630b79 RMD160 (mpg321-0.2.10.tar.gz) = c0867e6ca7c0a5e2ff006e0c3aa866d2fde529ba Size (mpg321-0.2.10.tar.gz) = 113449 bytes SHA1 (patch-aa) = d91d4af6219517fcb95da37b1a7abc05a3e312b2 +SHA1 (patch-ab) = b409e5feb618bed1a85d17df22e01cebfa62e8b1 diff --git a/audio/mpg321/patches/patch-ab b/audio/mpg321/patches/patch-ab new file mode 100644 index 00000000000..eabbf2fa711 --- /dev/null +++ b/audio/mpg321/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2010/05/19 18:25:19 drochner Exp $ + +--- ao.c.orig 2010-05-19 15:45:33.000000000 +0000 ++++ ao.c +@@ -229,6 +229,7 @@ void open_ao_playdevice(struct mad_heade + and restore it afterwards */ + signal(SIGINT, SIG_DFL); + ++ memset(&format, 0, sizeof(format)); + format.bits = 16; + format.rate = header->samplerate; + format.channels = (options.opt & MPG321_FORCE_STEREO) ? 2 : MAD_NCHANNELS(header); diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index f9600d553a3..b0dc2590ccb 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2010/04/12 19:10:42 drochner Exp $ +# $NetBSD: Makefile,v 1.45 2010/05/19 18:25:19 drochner Exp $ DISTNAME= mpd-0.15.9 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/mpd/musicpd/} CATEGORIES= audio #MASTER_SITES= http://musicpd.org/uploads/files/ diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index 2356a44c817..5afbd6503ea 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.27 2010/04/12 19:10:42 drochner Exp $ +$NetBSD: distinfo,v 1.28 2010/05/19 18:25:19 drochner Exp $ SHA1 (mpd-0.15.9.tar.bz2) = 9dbef302ef44372f2232c1df1af2f3a958ff601d RMD160 (mpd-0.15.9.tar.bz2) = 566440dbc16ac46f20d8d11bfe09ffe43423eb34 Size (mpd-0.15.9.tar.bz2) = 390141 bytes SHA1 (patch-aa) = 14c63f15f09d6d22770b90a30cc49951c8d1d38a SHA1 (patch-ab) = 080c2b068fd30cd9ea9c67fb1dcb5ca7c1336a04 +SHA1 (patch-ac) = 1fa9333d4e54ccabe02ed94c4bddd1d3a1e6d914 diff --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac new file mode 100644 index 00000000000..40ee2f192df --- /dev/null +++ b/audio/musicpd/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.3 2010/05/19 18:25:19 drochner Exp $ + +--- src/output/ao_plugin.c.orig 2010-05-19 14:49:45.000000000 +0000 ++++ src/output/ao_plugin.c +@@ -175,6 +175,7 @@ ao_output_open(void *data, struct audio_ + if (audio_format->bits > 16) + audio_format->bits = 16; + ++ memset(&format, 0, sizeof(format)); + format.bits = audio_format->bits; + format.rate = audio_format->sample_rate; + format.byte_format = AO_FMT_NATIVE; diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile index 94587066c9d..20b33f7a000 100644 --- a/audio/tremor-tools/Makefile +++ b/audio/tremor-tools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2010/03/21 16:29:39 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/05/19 18:25:19 drochner Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= tremor-tools-1.0.0.8 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= audio MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ diff --git a/audio/tremor-tools/distinfo b/audio/tremor-tools/distinfo index 81bf4e47854..e7b899a5268 100644 --- a/audio/tremor-tools/distinfo +++ b/audio/tremor-tools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2006/12/06 19:52:55 joerg Exp $ +$NetBSD: distinfo,v 1.5 2010/05/19 18:25:19 drochner Exp $ SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d RMD160 (vorbis-tools-1.0.tar.gz) = 2f3874699be904fdf64c6edf09e21ccb8f0eee28 @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 37b3128b58fd6dcaf303930c64ac7bf6df9fa043 SHA1 (patch-af) = 4bdf3edbd80ffdeacdc260fe172468ec2b0b3efb SHA1 (patch-ag) = 729ca84168ee781335429840ee54a2b894b82f54 SHA1 (patch-ah) = d865a74020d7c1ee6e24c6394f4a1336773fa87a +SHA1 (patch-ai) = c16f9f114472b1ced936d8e26161204bc25c9249 diff --git a/audio/tremor-tools/patches/patch-ai b/audio/tremor-tools/patches/patch-ai new file mode 100644 index 00000000000..14a48834b5b --- /dev/null +++ b/audio/tremor-tools/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1 2010/05/19 18:25:19 drochner Exp $ + +--- ogg123/callbacks.c.orig 2010-05-19 16:19:11.000000000 +0000 ++++ ogg123/callbacks.c +@@ -44,6 +44,7 @@ void audio_reopen_action (buf_t *buf, vo + + close_audio_devices (reopen_arg->devices); + ++ memset(&format, 0, sizeof(format)); + /* Record audio device settings and open the devices */ + format.rate = reopen_arg->format->rate; + format.channels = reopen_arg->format->channels; diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 4c9dba9016d..4b946e6e777 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2010/01/17 12:02:06 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2010/05/19 18:25:19 drochner Exp $ DISTNAME= vorbis-tools-1.2.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/vorbis/ diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index 8771cdab321..c0555558934 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2008/04/29 05:51:09 wiz Exp $ +$NetBSD: distinfo,v 1.22 2010/05/19 18:25:19 drochner Exp $ SHA1 (vorbis-tools-1.2.0.tar.gz) = c5c5ee4637ab8c9fc953d203663b7264432f874a RMD160 (vorbis-tools-1.2.0.tar.gz) = 8cb6925c6e4e69373b6c91ff20d7ed8d75153b7c @@ -7,3 +7,4 @@ SHA1 (patch-aa) = a9fe36760479678df09f840671c515e0d9f37796 SHA1 (patch-ab) = b706ae0bc9e13c5ccff689aa1451efc782e340e9 SHA1 (patch-ac) = 53065c4db39f7e975712c2cba51ff5542cf5a77f SHA1 (patch-ad) = 6fe04631cd098fc64bf0914f1fd4ef654c0089b0 +SHA1 (patch-ae) = 3984d1b7b7207afe70cee29db072a304b69db194 diff --git a/audio/vorbis-tools/patches/patch-ae b/audio/vorbis-tools/patches/patch-ae new file mode 100644 index 00000000000..d204062bb18 --- /dev/null +++ b/audio/vorbis-tools/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.3 2010/05/19 18:25:20 drochner Exp $ + +--- ogg123/callbacks.c.orig 2010-05-19 16:23:11.000000000 +0000 ++++ ogg123/callbacks.c +@@ -48,6 +48,7 @@ void audio_reopen_action (buf_t *buf, vo + + close_audio_devices (reopen_arg->devices); + ++ memset(&format, 0, sizeof(format)); + /* Record audio device settings and open the devices */ + format.rate = reopen_arg->format->rate; + format.channels = reopen_arg->format->channels; -- cgit v1.2.3