zero-initialize format specifier for libao, bump PKGREVISION

6 files changed, 46 insertions, 3 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index cb9cf718b58..c42d6b97e92 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2008/01/03 23:18:07 heinz Exp $
+# $NetBSD: Makefile,v 1.34 2010/05/19 18:22:14 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
+PKGREVISION=	1
+
 PKGNAME=		cdrdao-${CDRDAO_VER}
 
 COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
index b9e166c4a05..fb186db1a02 100644
--- a/sysutils/cdrdao/distinfo
+++ b/sysutils/cdrdao/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2010/01/10 05:39:29 obache Exp $
+$NetBSD: distinfo,v 1.23 2010/05/19 18:22:14 drochner Exp $
 
 SHA1 (cdrdao-1.2.3.tar.bz2) = 70d6547795a1342631c7ab56709fd1940c2aff9f
 RMD160 (cdrdao-1.2.3.tar.bz2) = a162bdf2bc4d65581816d3a9e3c0d3ba66bb6523
@@ -19,3 +19,6 @@ SHA1 (patch-aq) = f984313e7ff141cee289cc78a9679fc5d9a160aa
 SHA1 (patch-ar) = 20cc6521c62d9c273999604c1cabbf023e31804b
 SHA1 (patch-as) = 95818ecbcfaf7a2799292bbb5acbcf5100f42b81
 SHA1 (patch-at) = c6379b51f2f81c73a0976d35c62555860b20168d
+SHA1 (patch-au) = dd8d9d6b73ea662ef3e936580082f9b733c6596c
+SHA1 (patch-av) = 1053b438744ce9e64e0ab093679ed71fbce9a533
+SHA1 (patch-aw) = 2709a43c30a467323f4f99a19f5d8e9f212fd694
diff --git a/sysutils/cdrdao/patches/patch-au b/sysutils/cdrdao/patches/patch-au
new file mode 100644
index 00000000000..339033c0b56
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-au
@@ -0,0 +1,12 @@
+$NetBSD: patch-au,v 1.1 2010/05/19 18:22:14 drochner Exp $
+
+--- ./trackdb/FormatOgg.cc.orig	2010-05-19 14:56:10.000000000 +0000
++++ ./trackdb/FormatOgg.cc
+@@ -84,6 +84,7 @@ FormatSupport::Status FormatOgg::oggInit
+       return FS_WRONG_FORMAT;
+   }
+ 
++  memset(&outFormat_, 0, sizeof(outFormat_));
+   outFormat_.bits = 16;
+   outFormat_.rate = 44100;
+   outFormat_.channels = 2;
diff --git a/sysutils/cdrdao/patches/patch-av b/sysutils/cdrdao/patches/patch-av
new file mode 100644
index 00000000000..49b8c7d6d98
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2010/05/19 18:22:14 drochner Exp $
+
+--- trackdb/FormatMp3.cc.orig	2010-05-19 14:58:05.000000000 +0000
++++ trackdb/FormatMp3.cc
+@@ -111,6 +111,7 @@ FormatSupport::Status FormatMp3::madInit
+ 
+   // Initialize libao for WAV output;
+   ao_sample_format out_format;
++  memset(&out_format, 0, sizeof(out_format));
+   out_format.bits = 16;
+   out_format.rate = 44100;
+   out_format.channels = 2;
diff --git a/sysutils/cdrdao/patches/patch-aw b/sysutils/cdrdao/patches/patch-aw
new file mode 100644
index 00000000000..76276bb73a2
--- /dev/null
+++ b/sysutils/cdrdao/patches/patch-aw
@@ -0,0 +1,12 @@
+$NetBSD: patch-aw,v 1.1 2010/05/19 18:22:14 drochner Exp $
+
+--- xdao/SoundIF-ao.cc.orig	2010-05-19 14:58:48.000000000 +0000
++++ xdao/SoundIF-ao.cc
+@@ -37,6 +37,7 @@ SoundIF::SoundIF()
+ 
+   impl_ = new SoundIFImpl;
+   impl_->driverId = ao_default_driver_id();
++  memset(&impl_->format, 0, sizeof(impl_->format));
+   impl_->format.bits = 16;
+   impl_->format.rate = 44100;
+   impl_->format.channels = 2;
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 4155e847fb4..971eee9aade 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.45 2009/11/22 21:06:20 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2010/05/19 18:22:14 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
+PKGREVISION=	1
+
 PKGNAME=	gcdmaster-${CDRDAO_VER}
 COMMENT=	Gnome UI frontend to cdrdao