Fix the writing of unicode tags. bump pkgrevision. Addresses PR#34515.

http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979

Patch adapted for pkgsrc by George Michaelson.

4 files changed, 46 insertions, 3 deletions

diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index d852dcccd73..b98c4440e6d 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/09/13 12:06:28 ben Exp $
 #
 
 DISTNAME=	id3lib-3.8.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
diff --git a/audio/id3lib/distinfo b/audio/id3lib/distinfo
index e7640239572..9d391461b56 100644
--- a/audio/id3lib/distinfo
+++ b/audio/id3lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.12 2006/09/13 12:06:28 ben Exp $
 
 SHA1 (id3lib-3.8.3.tar.gz) = c92c880da41d1ec0b242745a901702ae87970838
 RMD160 (id3lib-3.8.3.tar.gz) = bfa2499ec649ed40815ad0a370c78eb1517952c4
@@ -6,3 +6,5 @@ Size (id3lib-3.8.3.tar.gz) = 950726 bytes
 SHA1 (patch-aa) = 75b19258eeaeb65aa2fa43cd44769aa1d6e575c3
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
+SHA1 (patch-ah) = 42a04014cc839565063daa395884b757214eb911
+SHA1 (patch-ai) = c0521a6d62d17826c9b1f35f6be51e1b72c48e7c
diff --git a/audio/id3lib/patches/patch-ah b/audio/id3lib/patches/patch-ah
new file mode 100644
index 00000000000..dcfa9a4a03d
--- /dev/null
+++ b/audio/id3lib/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2006/09/13 12:06:28 ben Exp $
+
+--- ChangeLog.orig	2003-03-01 16:23:00.000000000 -0800
++++ ChangeLog
+@@ -1,3 +1,8 @@
++2006-02-17  Jerome Couderc
++
++	* Patch from Spoon to fix UTF-16 writing bug
++	http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
+ 
+ 	* THANKS (1.20): added more people 
diff --git a/audio/id3lib/patches/patch-ai b/audio/id3lib/patches/patch-ai
new file mode 100644
index 00000000000..a229676d097
--- /dev/null
+++ b/audio/id3lib/patches/patch-ai
@@ -0,0 +1,28 @@
+$NetBSD: patch-ai,v 1.3 2006/09/13 12:06:28 ben Exp $
+
+--- src/io_helpers.cpp.orig	2003-03-01 16:23:00.000000000 -0800
++++ src/io_helpers.cpp
+@@ -363,11 +363,22 @@ size_t io::writeUnicodeText(ID3_Writer& 
+     // Write the BOM: 0xFEFF
+     unicode_t BOM = 0xFEFF;
+     writer.writeChars((const unsigned char*) &BOM, 2);
++    // Patch from Spoon : 2004-08-25 14:17
++    // http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++    // Wrong code
++    //for (size_t i = 0; i < size; i += 2)
++    //{
++    //  unicode_t ch = (data[i] << 8) | data[i+1];
++    //  writer.writeChars((const unsigned char*) &ch, 2);
++    //}
++    // Right code
++    unsigned char *pdata = (unsigned char *) data.c_str();
+     for (size_t i = 0; i < size; i += 2)
+     {
+-      unicode_t ch = (data[i] << 8) | data[i+1];
++      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+       writer.writeChars((const unsigned char*) &ch, 2);
+     }
++    // End patch
+   }
+   return writer.getCur() - beg;
+ }