Update to 0.5.7:

2004-05-16  Sam Clegg

	* Version 0.5.7

	* Implement simple config dialog.

	* When fast playtime calculation is enabled, dedode the first
	  10 frames only.

2004-01-24  Sam Clegg

	* decoder.c: better xing bitrate calculation.

2003-12-28  Sam Clegg

	* Version 0.5.6

	* configure.ac: don't depend on pkgconfig files from
	libmad and libid3tag that aren't shipped by upstream

	* decoder.c xmms-mad.[ch]: fix xing header usage. added
	use_xing configuration option to disable it.

5 files changed, 23 insertions, 24 deletions

diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index b2c27529986..b4df3c8254a 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/04/06 06:21:37 reed Exp $
+# $NetBSD: Makefile,v 1.23 2006/08/07 23:46:23 wiz Exp $
 #
 
-DISTNAME=		xmms-mad-0.5.5
-PKGREVISION=		3
+DISTNAME=		xmms-mad-0.5.7
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmms-mad/}
 
diff --git a/audio/xmms-mad/distinfo b/audio/xmms-mad/distinfo
index 0f3d161ca34..9a02e68a413 100644
--- a/audio/xmms-mad/distinfo
+++ b/audio/xmms-mad/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/12/06 21:54:25 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/08/07 23:46:23 wiz Exp $
 
-SHA1 (xmms-mad-0.5.5.tar.gz) = f571d049821b72bf5fe49fb9c58d71aefa01057e
-RMD160 (xmms-mad-0.5.5.tar.gz) = b7e7af55aebbd4cf88dee4a421475db32ca9aa3f
-Size (xmms-mad-0.5.5.tar.gz) = 307441 bytes
-SHA1 (patch-aa) = e92ed1f948efab64fed029102e563fe1aab9463d
-SHA1 (patch-ab) = 169850b0f96e2097824ef6d8a48a2c7cad815780
-SHA1 (patch-ac) = 83e50caa2d7c4baed6e86b11ef0793f4a1694185
+SHA1 (xmms-mad-0.5.7.tar.gz) = b45d8d42069d1a550c85633649edfc59df6312da
+RMD160 (xmms-mad-0.5.7.tar.gz) = 1c51dc570ea3f8bd2c62cf93176673a2307170da
+Size (xmms-mad-0.5.7.tar.gz) = 303044 bytes
+SHA1 (patch-aa) = 425482b7e945e4c2770fd273eb640cbde0b4f705
+SHA1 (patch-ab) = 88f1b7af5e976d92d1a98251f876026d54cb3fc2
+SHA1 (patch-ac) = 01cc47abfbe60ac5718e71cfbd5fa6076ed7f527
diff --git a/audio/xmms-mad/patches/patch-aa b/audio/xmms-mad/patches/patch-aa
index 4566ffb5252..a57b7401a38 100644
--- a/audio/xmms-mad/patches/patch-aa
+++ b/audio/xmms-mad/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/12/23 09:52:11 simonb Exp $
+$NetBSD: patch-aa,v 1.4 2006/08/07 23:46:23 wiz Exp $
 
---- src/decoder.c.orig	Fri May 30 21:31:35 2003
+--- src/decoder.c.orig	2004-05-16 17:08:05.000000000 +0000
 +++ src/decoder.c
-@@ -260,6 +260,9 @@ decode (void *arg)
+@@ -274,6 +274,9 @@ decode (void *arg)
    /* main loop */
    do
      {
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.3 2003/12/23 09:52:11 simonb Exp $
        if (info->stop)
          break;
        if (seek_skip)
-@@ -416,6 +419,8 @@ decode (void *arg)
+@@ -430,6 +433,8 @@ decode (void *arg)
  #endif /* DEBUG */
  
    mad_plugin.output->close_audio ();
diff --git a/audio/xmms-mad/patches/patch-ab b/audio/xmms-mad/patches/patch-ab
index 7d43bc2dc9c..4277ccaced4 100644
--- a/audio/xmms-mad/patches/patch-ab
+++ b/audio/xmms-mad/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2003/12/17 03:27:17 simonb Exp $
+$NetBSD: patch-ab,v 1.4 2006/08/07 23:46:23 wiz Exp $
 
---- src/xmms-mad.c.orig	Thu Oct  2 22:15:58 2003
+--- src/xmms-mad.c.orig	2004-05-16 16:54:38.000000000 +0000
 +++ src/xmms-mad.c
-@@ -142,6 +142,9 @@ xmmsmad_stop ()
+@@ -144,6 +144,9 @@ xmmsmad_stop ()
        g_message ("waiting for thread");
  #endif /* DEBUG */
        pthread_join (*decode_thread, 0);
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.3 2003/12/17 03:27:17 simonb Exp $
  #ifdef DEBUG
        g_message ("thread done");
  #endif /* DEBUG */
-@@ -186,6 +189,9 @@ xmmsmad_play_file (char *url)
+@@ -185,6 +188,9 @@ xmmsmad_play_file (char *url)
        g_free (decode_thread);
        decode_thread = 0;
      }
diff --git a/audio/xmms-mad/patches/patch-ac b/audio/xmms-mad/patches/patch-ac
index be071c38567..752eb53f076 100644
--- a/audio/xmms-mad/patches/patch-ac
+++ b/audio/xmms-mad/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2005/12/06 21:54:25 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2006/08/07 23:46:23 wiz Exp $
 
---- src/input.c.orig	2003-09-24 18:01:50.000000000 +0000
+--- src/input.c.orig	2004-05-16 16:24:04.000000000 +0000
 +++ src/input.c
-@@ -24,6 +24,10 @@
- #include <assert.h>
- #endif /* HAVE_ASSERT_H */
+@@ -28,6 +28,10 @@
+ #include <sys/types.h>
+ #endif /* HAVE_SYS_TYPES_H */
  
 +#ifdef HAVE_SYS_TYPES_H
 +#include <sys/types.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 2005/12/06 21:54:25 joerg Exp $
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif /* HAVE_SYS_SOCKET_H */
-@@ -447,6 +451,9 @@ input_read_tag (struct mad_info_t *info)
+@@ -451,6 +455,9 @@ input_read_tag (struct mad_info_t *info)
    if (title_input->genre)        g_free (title_input->genre);
    if (title_input->comment)      g_free (title_input->comment);
    g_free (title_input);