[55170] trunk/dports/audio/id3lib

[toby at macports.org]

Revision: 55170
          http://trac.macports.org/changeset/55170
Author:   toby at macports.org
Date:     2009-08-07 00:26:54 -0700 (Fri, 07 Aug 2009)
Log Message:
-----------
#18888 (easytag 2.1 reports unicode handling bug in id3lib)

Modified Paths:
--------------
    trunk/dports/audio/id3lib/Portfile

Added Paths:
-----------
    trunk/dports/audio/id3lib/files/
    trunk/dports/audio/id3lib/files/patch_id3lib_3.8.3_UTF16_writing_bug.diff

Modified: trunk/dports/audio/id3lib/Portfile
===================================================================
--- trunk/dports/audio/id3lib/Portfile	2009-08-07 07:24:42 UTC (rev 55169)
+++ trunk/dports/audio/id3lib/Portfile	2009-08-07 07:26:54 UTC (rev 55170)
@@ -1,7 +1,8 @@
 # $Id$
 PortSystem 1.0
 name            id3lib
-version		3.8.3
+version         3.8.3
+revision        1
 categories      audio
 maintainers     nomaintainer
 description     ID3 tag manipulation
@@ -18,6 +19,9 @@
 depends_lib     port:libiconv \
                 port:zlib
 
+patchfiles      patch_id3lib_3.8.3_UTF16_writing_bug.diff
+patch.pre_args  -p1
+
 configure.ccache    no
 
 use_parallel_build  yes

Added: trunk/dports/audio/id3lib/files/patch_id3lib_3.8.3_UTF16_writing_bug.diff
===================================================================
--- trunk/dports/audio/id3lib/files/patch_id3lib_3.8.3_UTF16_writing_bug.diff	                        (rev 0)
+++ trunk/dports/audio/id3lib/files/patch_id3lib_3.8.3_UTF16_writing_bug.diff	2009-08-07 07:26:54 UTC (rev 55170)
@@ -0,0 +1,39 @@
+diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
+--- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+@@ -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 at id3lib.org>
+ 
+ 	* THANKS (1.20): added more people 
+diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
+--- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+@@ -363,11 +363,22 @@
+     // 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;
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090807/a6a70b8d/attachment.html>