From 70c2e6cd3d22273ed4a27235791ac085ce7fbc1b Mon Sep 17 00:00:00 2001 From: Yalla-One Date: Thu, 13 May 2010 00:29:54 +0200 Subject: libraries/id3lib: Updated for version 3.8.3 --- .../id3lib/patches/id3lib-3.8.3-GCC43FIX-1.patch | 90 ++++++++++++++++++++++ .../patches/id3lib_3.8.3_UTF16_writing_bug.patch | 39 ++++++++++ libraries/id3lib/patches/id3lib_Doxyfile.patch | 22 ++++++ 3 files changed, 151 insertions(+) create mode 100644 libraries/id3lib/patches/id3lib-3.8.3-GCC43FIX-1.patch create mode 100644 libraries/id3lib/patches/id3lib_3.8.3_UTF16_writing_bug.patch create mode 100644 libraries/id3lib/patches/id3lib_Doxyfile.patch (limited to 'libraries/id3lib/patches') diff --git a/libraries/id3lib/patches/id3lib-3.8.3-GCC43FIX-1.patch b/libraries/id3lib/patches/id3lib-3.8.3-GCC43FIX-1.patch new file mode 100644 index 0000000000000..cae30e187085d --- /dev/null +++ b/libraries/id3lib/patches/id3lib-3.8.3-GCC43FIX-1.patch @@ -0,0 +1,90 @@ +Submitted By: zippo zippo@oppiz.net +Date: 2008-10-28 +Initial Package Version: 3.8.3 +Upstream Status: Unknown +Origin: zippo@oppiz.net +Description:Fixes things up for GCC-4.3.2 + +diff -Naur id3lib-3.8.3/examples/demo_convert.cpp 32/id3lib-3.8.3/examples/demo_convert.cpp +--- id3lib-3.8.3/examples/demo_convert.cpp 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/examples/demo_convert.cpp 2008-10-29 20:10:04.000000000 +0000 +@@ -84,7 +84,7 @@ + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + flags_t ulFlag = ID3TT_ALL; + gengetopt_args_info args; +diff -Naur id3lib-3.8.3/examples/demo_copy.cpp 32/id3lib-3.8.3/examples/demo_copy.cpp +--- id3lib-3.8.3/examples/demo_copy.cpp 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/examples/demo_copy.cpp 2008-10-29 20:10:54.000000000 +0000 +@@ -81,7 +81,7 @@ + } + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +diff -Naur id3lib-3.8.3/examples/demo_info.cpp 32/id3lib-3.8.3/examples/demo_info.cpp +--- id3lib-3.8.3/examples/demo_info.cpp 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/examples/demo_info.cpp 2008-10-29 20:09:31.000000000 +0000 +@@ -309,7 +309,7 @@ + + #define DEBUG + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + ID3D_INIT_DOUT(); + +diff -Naur id3lib-3.8.3/examples/demo_tag.cpp 32/id3lib-3.8.3/examples/demo_tag.cpp +--- id3lib-3.8.3/examples/demo_tag.cpp 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/examples/demo_tag.cpp 2008-10-29 20:10:26.000000000 +0000 +@@ -46,7 +46,7 @@ + os << "v2"; + } + +-int main( unsigned int argc, char * const argv[]) ++int main(int argc, char * const argv[]) + { + int ulFlag = ID3TT_ID3; + ID3D_INIT_DOUT(); +diff -Naur id3lib-3.8.3/include/id3/id3lib_strings.h 32/id3lib-3.8.3/include/id3/id3lib_strings.h +--- id3lib-3.8.3/include/id3/id3lib_strings.h 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/include/id3/id3lib_strings.h 2008-10-29 20:03:28.000000000 +0000 +@@ -30,6 +30,7 @@ + #define _ID3LIB_STRINGS_H_ + + #include ++#include "string.h" + + #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) + namespace std +diff -Naur id3lib-3.8.3/include/id3/writers.h 32/id3lib-3.8.3/include/id3/writers.h +--- id3lib-3.8.3/include/id3/writers.h 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/include/id3/writers.h 2008-10-29 20:05:56.000000000 +0000 +@@ -30,7 +30,7 @@ + + #include "id3/writer.h" + #include "id3/id3lib_streams.h" +-//#include ++#include "string.h" + + class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer + { +diff -Naur id3lib-3.8.3/src/field.cpp 32/id3lib-3.8.3/src/field.cpp +--- id3lib-3.8.3/src/field.cpp 2003-03-02 00:23:00.000000000 +0000 ++++ 32/id3lib-3.8.3/src/field.cpp 2008-10-29 20:02:19.000000000 +0000 +@@ -33,6 +33,8 @@ + #include "readers.h" + #include + ++#include "string.h" ++ + using namespace dami; + + // This is used for unimplemented frames so that their data is preserved when diff --git a/libraries/id3lib/patches/id3lib_3.8.3_UTF16_writing_bug.patch b/libraries/id3lib/patches/id3lib_3.8.3_UTF16_writing_bug.patch new file mode 100644 index 0000000000000..b05d2cf298d3d --- /dev/null +++ b/libraries/id3lib/patches/id3lib_3.8.3_UTF16_writing_bug.patch @@ -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 + + * 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; + } diff --git a/libraries/id3lib/patches/id3lib_Doxyfile.patch b/libraries/id3lib/patches/id3lib_Doxyfile.patch new file mode 100644 index 0000000000000..76288cbb05c80 --- /dev/null +++ b/libraries/id3lib/patches/id3lib_Doxyfile.patch @@ -0,0 +1,22 @@ +--- a/Doxyfile.in 2005-01-05 14:27:05.000000000 +0100 ++++ b/Doxyfile.in 2005-01-05 14:30:19.000000000 +0100 +@@ -263,14 +263,17 @@ + + INPUT = ../src \ + ../include/id3/field.h \ +- ../include/id3/frame.h \ + ../include/id3/globals.h \ ++ ../include/id3/helpers.h \ ++ ../include/id3/id3lib_frame.h \ ++ ../include/id3/id3lib_streams.h \ ++ ../include/id3/id3lib_strings.h \ + ../include/id3/misc_support.h \ + ../include/id3/reader.h \ + ../include/id3/readers.h \ + ../include/id3/sized_types.h \ + ../include/id3/tag.h \ +- ../include/id3/tag.h \ ++ ../include/id3/utils.h \ + ../include/id3/writer.h \ + ../include/id3/writers.h + -- cgit v1.2.3