Changes 0.7.7:

* Fixed bug with reading broken wav files with bad sizes
* Fixed bug causing seg fault on non-PCM wav files
* Fixed bug with reading wav files that have stuff after the data chunk
* Fixed Windows "no such file" bug
* Fixed small memory leak
* Fixed cosmetic bug with negative gains
* Fixed bad basename regexp in normalize-mp3 script
* Fixed --oggdecode option in normalize-mp3 script
* Turned audiofile support on by default
* Upgraded to latest GNU autotools

Pkgsrc:
* Build xmms plug-in as an option

5 files changed, 35 insertions, 19 deletions

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index a0025f046cd..415e255f1bf 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:28:57 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.18 2006/04/21 09:28:47 adam Exp $
 
-DISTNAME=	normalize-0.7.6
-PKGREVISION=	6
+DISTNAME=	normalize-0.7.7
 CATEGORIES=	audio
 MASTER_SITES=	http://www1.cs.columbia.edu/~cvaill/normalize/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www1.cs.columbia.edu/~cvaill/normalize/
-COMMENT=	Wave (.wav) file volume normalizer
+COMMENT=	Audio file volume normalizer (wav,mp3,ogg)
 
-USE_PKGLOCALEDIR=	YES
-USE_LIBTOOL=		YES
-GNU_CONFIGURE=		YES
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
 
-#CONFIGURE_ARGS+=	--with-audiofile
+CONFIGURE_ARGS+=	--with-audiofile
 CONFIGURE_ARGS+=	--with-mad
 
-#.include "../../audio/libaudiofile/buildlink3.mk"
+.include "options.mk"
+
+.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/normalize/PLIST b/audio/normalize/PLIST
index 8ec536ce5ee..b73cfec2311 100644
--- a/audio/normalize/PLIST
+++ b/audio/normalize/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/21 09:28:47 adam Exp $
 bin/normalize
 bin/normalize-mp3
 bin/normalize-ogg
+${XMMS_PLUGIN}lib/xmms/Effect/librva.la
 man/man1/normalize-mp3.1
 man/man1/normalize.1
 share/locale/en_GB/LC_MESSAGES/normalize.mo
diff --git a/audio/normalize/distinfo b/audio/normalize/distinfo
index bc0b6a5f12d..6e9f3c9b85d 100644
--- a/audio/normalize/distinfo
+++ b/audio/normalize/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/04/21 09:28:47 adam Exp $
 
-SHA1 (normalize-0.7.6.tar.gz) = db42d155bc75ae64a222888de96ea966ccf484a7
-RMD160 (normalize-0.7.6.tar.gz) = 1a3904efc40eb8d77a623a672a2156fd33bc38a2
-Size (normalize-0.7.6.tar.gz) = 383659 bytes
-SHA1 (patch-aa) = 250961e403d0ae929276d55cae99e08077cb6f79
+SHA1 (normalize-0.7.7.tar.bz2) = 1d84a9e1cd50b24ebb99428452604dd1fb78be9d
+RMD160 (normalize-0.7.7.tar.bz2) = cfb47808816da4196b7d87033921716bf13f212d
+Size (normalize-0.7.7.tar.bz2) = 388777 bytes
+SHA1 (patch-aa) = 1a19b511ac51b7b052507c795af3273ca688c7b8
diff --git a/audio/normalize/options.mk b/audio/normalize/options.mk
new file mode 100644
index 00000000000..060d1e27adc
--- /dev/null
+++ b/audio/normalize/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2006/04/21 09:28:47 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.normalize
+PKG_SUPPORTED_OPTIONS=	xmms
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mxmms)
+PLIST_SUBST+=	XMMS_PLUGIN=
+.include "../../audio/xmms/buildlink3.mk"
+.else
+PLIST_SUBST+=	XMMS_PLUGIN="@comment "
+.endif
diff --git a/audio/normalize/patches/patch-aa b/audio/normalize/patches/patch-aa
index fdc1e978f3c..7d9b987afbb 100644
--- a/audio/normalize/patches/patch-aa
+++ b/audio/normalize/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/12/27 21:38:06 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2006/04/21 09:28:47 adam Exp $
 
---- src/mpegvolume.c.orig	2002-08-26 08:32:26.000000000 +0200
+--- src/mpegvolume.c.orig	2005-09-09 22:24:26.000000000 +0200
 +++ src/mpegvolume.c
-@@ -312,6 +312,7 @@ decode_output(void *dat, struct mad_head
+@@ -306,6 +306,7 @@ decode_output(void *dat, struct mad_head
       */
      ds->si->bits_per_sample = 16;
      ds->sums[0] = ds->sums[1] = 0;