Updated xmms-wma to 1.0.5.

Changes in 1.0.5
- Added opportunity to build plug-in for player BMP.
- Fix bug with blanks with use gnome-vfs in BMP.
- WARNING: BEEPMP-WMA conflict with BMP-WMA. Remove BMP-WMA or do not use BEEPMP-WMA.

3 files changed, 6 insertions, 67 deletions

diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index 7165b3a3293..5b5ac64352e 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/06 18:21:37 rillig Exp $
 #
 
-DISTNAME=	xmms-wma-1.0.4
-PKGREVISION=	1
+DISTNAME=	xmms-wma-1.0.5
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xmms-wma/distinfo b/audio/xmms-wma/distinfo
index 45102067962..8e34bb99b71 100644
--- a/audio/xmms-wma/distinfo
+++ b/audio/xmms-wma/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/07/28 00:56:13 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/01/06 18:21:37 rillig Exp $
 
-SHA1 (xmms-wma-1.0.4.tar.bz2) = b7071c6fc17b22cb861f5071c97f72f876f271f9
-RMD160 (xmms-wma-1.0.4.tar.bz2) = bd79cf369a739000facc00f59d7a0d30dab6f5eb
-Size (xmms-wma-1.0.4.tar.bz2) = 145691 bytes
+SHA1 (xmms-wma-1.0.5.tar.bz2) = 168a97e540601c7ad939a7d06ab3c23eb73ebdb9
+RMD160 (xmms-wma-1.0.5.tar.bz2) = 7c2418fce81f41bffe699e676b62fbb1ca24456a
+Size (xmms-wma-1.0.5.tar.bz2) = 146687 bytes
 SHA1 (patch-aa) = 817d7969c904d46cced1fbd93c753fa3d84f461a
 SHA1 (patch-ab) = 6a7daf57e68ca1bde8c9f9fb14af25843f5ba34e
-SHA1 (patch-ac) = 93e1fd03a950fbd995d492bda07b28ce81e339f4
 SHA1 (patch-ad) = aee4ea1a154f71b2d4d1672bd8226ed76e0f909a
diff --git a/audio/xmms-wma/patches/patch-ac b/audio/xmms-wma/patches/patch-ac
deleted file mode 100644
index 79c07927937..00000000000
--- a/audio/xmms-wma/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/05/23 08:50:36 rillig Exp $
-
---- ffmpeg-strip-wma/asf.c.orig	Wed May 26 19:16:39 2004
-+++ ffmpeg-strip-wma/asf.c	Sat Dec 11 21:32:58 2004
-@@ -16,10 +16,13 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-+
-+#ifdef USE_ICONV
-+#include <iconv.h>
-+#endif
-+
- #include "avformat.h"
- #include "avi.h"
--//#include "mpegaudio.h"
--#include <iconv.h>
- 
- #undef NDEBUG
- #include <assert.h>
-@@ -830,6 +833,7 @@
-     return str;
- }
- 
-+#ifdef USE_ICONV
- static void tag_recode(char *before, int len)
- {
-        int result;
-@@ -859,6 +863,7 @@
- 		return;
-        return;
- }
-+#endif
- 
- static void get_str16_nolen(ByteIOContext *pb, int len, char *buf, int buf_size)
- {
-@@ -868,12 +873,17 @@
-     q = buf;
-     lenz = len;
-     while (len > 0) {
--        c = get_byte(pb);
--        if ((q - buf) < buf_size-1)
--            *q++ = c;
--        len--;
-+    	c = get_byte(pb);
-+	if ((q - buf) < buf_size - 1)
-+		*q++ = c;
-+	len--;
-     }
--    tag_recode(buf, lenz);
-+
-+#ifdef USE_ICONV
-+	tag_recode(buf, lenz);
-+#else	
-+    *q = '\0';			  
-+#endif
- }
- 
- static int asf_probe(AVProbeData *pd)