reinit the tree, so we can have metadata

7 files changed, 378 insertions, 0 deletions

diff --git a/media-libs/taglib/files/taglib-1.11-install-examples.patch b/media-libs/taglib/files/taglib-1.11-install-examples.patch
new file mode 100644
index 000000000000..fd676c6aec14
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11-install-examples.patch
@@ -0,0 +1,13 @@
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -37,3 +37,10 @@
+ add_executable(strip-id3v1 strip-id3v1.cpp)
+ target_link_libraries(strip-id3v1 tag)
+ 
++INSTALL(TARGETS
++  tagreader tagreader_c tagwriter framelist strip-id3v1
++  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
++)
++
diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
new file mode 100644
index 000000000000..4b567da19821
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch
@@ -0,0 +1,30 @@
+From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001
+From: "Stephen F. Booth" <me@sbooth.org>
+Date: Sun, 23 Jul 2017 10:11:09 -0400
+Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame
+
+If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame
+which causes problems in rebuildAggregateFrames() when it is assumed
+that TDRC is a TextIdentificationFrame
+---
+ taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp
+index 759a9b7be..9347ab869 100644
+--- a/taglib/mpeg/id3v2/id3v2framefactory.cpp
++++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp
+@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const
+      tag->frameList("TDAT").size() == 1)
+   {
+     TextIdentificationFrame *tdrc =
+-      static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
++      dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front());
+     UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front());
+ 
+-    if(tdrc->fieldList().size() == 1 &&
++    if(tdrc &&
++       tdrc->fieldList().size() == 1 &&
+        tdrc->fieldList().front().size() == 4 &&
+        tdat->data().size() >= 5)
+     {
diff --git a/media-libs/taglib/files/taglib-1.6.1-install-examples.patch b/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
new file mode 100644
index 000000000000..f53768175a32
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.6.1-install-examples.patch
@@ -0,0 +1,16 @@
+diff -purN taglib-1.6.1.orig/examples/CMakeLists.txt taglib-1.6.1/examples/CMakeLists.txt
+--- taglib-1.6.1.orig/examples/CMakeLists.txt	2009-09-09 14:16:38.000000000 -0400
++++ taglib-1.6.1/examples/CMakeLists.txt	2009-12-14 18:47:33.405385063 -0500
+@@ -45,6 +45,12 @@ ADD_EXECUTABLE(strip-id3v1 strip-id3v1.c
+ 
+ TARGET_LINK_LIBRARIES(strip-id3v1  tag )
+ 
++INSTALL(TARGETS
++	tagreader tagreader_c tagwriter framelist strip-id3v1
++	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
++	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
++)
+ 
+ endif(BUILD_EXAMPLES)
+ 
diff --git a/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch b/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
new file mode 100644
index 000000000000..930439fc8349
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-abi-breakage.patch
@@ -0,0 +1,107 @@
+From 3bf30af66c8fd77a88d9379a0956ddb2fc70dc20 Mon Sep 17 00:00:00 2001
+From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
+Date: Wed, 6 Nov 2013 17:01:21 +0900
+Subject: [PATCH 2/6] Fixed ABI breakage in TagLib::String
+
+---
+ taglib/toolkit/tstring.cpp | 20 ++++++++++++++++++--
+ taglib/toolkit/tstring.h   | 12 ++++++++++--
+ tests/test_string.cpp      | 14 ++++++++++++++
+ 3 files changed, 42 insertions(+), 4 deletions(-)
+
+diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
+index 75a9833..fb6e947 100644
+--- a/taglib/toolkit/tstring.cpp
++++ b/taglib/toolkit/tstring.cpp
+@@ -209,8 +209,16 @@ String::String(const std::string &s, Type t)
+ String::String(const wstring &s, Type t)
+   : d(new StringPrivate())
+ {
+-  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
++  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
++    // This looks ugly but needed for the compatibility with TagLib1.8. 
++    // Should be removed in TabLib2.0.
++    if (t == UTF16BE)
++      t = WCharByteOrder;
++    else if (t == UTF16LE)
++      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
++
+     copyFromUTF16(s.c_str(), s.length(), t);
++  }
+   else {
+     debug("String::String() -- A TagLib::wstring should not contain Latin1 or UTF-8.");
+   }
+@@ -219,8 +227,16 @@ String::String(const wstring &s, Type t)
+ String::String(const wchar_t *s, Type t)
+   : d(new StringPrivate())
+ {
+-  if(t == UTF16 || t == UTF16BE || t == UTF16LE)
++  if(t == UTF16 || t == UTF16BE || t == UTF16LE) {
++    // This looks ugly but needed for the compatibility with TagLib1.8. 
++    // Should be removed in TabLib2.0.
++    if (t == UTF16BE)
++      t = WCharByteOrder;
++    else if (t == UTF16LE)
++      t = (WCharByteOrder == UTF16LE ? UTF16BE : UTF16LE);
++
+     copyFromUTF16(s, ::wcslen(s), t);
++  }
+   else {
+     debug("String::String() -- A const wchar_t * should not contain Latin1 or UTF-8.");
+   }
+diff --git a/taglib/toolkit/tstring.h b/taglib/toolkit/tstring.h
+index 57945be..605b9c2 100644
+--- a/taglib/toolkit/tstring.h
++++ b/taglib/toolkit/tstring.h
+@@ -134,13 +134,21 @@ namespace TagLib {
+ 
+     /*!
+      * Makes a deep copy of the data in \a s.
++     *
++     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
++     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
++     * will be changed in TagLib2.0.
+      */
+-    String(const wstring &s, Type t = WCharByteOrder);
++    String(const wstring &s, Type t = UTF16BE);
+ 
+     /*!
+      * Makes a deep copy of the data in \a s.
++     *
++     * /note If \a t is UTF16LE, the byte order of \a s will be swapped regardless 
++     * of the CPU byte order.  If UTF16BE, it will not be swapped.  This behavior
++     * will be changed in TagLib2.0.
+      */
+-    String(const wchar_t *s, Type t = WCharByteOrder);
++    String(const wchar_t *s, Type t = UTF16BE);
+ 
+     /*!
+      * Makes a deep copy of the data in \a c.
+diff --git a/tests/test_string.cpp b/tests/test_string.cpp
+index a815a0b..9a574b3 100644
+--- a/tests/test_string.cpp
++++ b/tests/test_string.cpp
+@@ -75,6 +75,20 @@ public:
+ 	String unicode3(L"\u65E5\u672C\u8A9E");
+ 	CPPUNIT_ASSERT(*(unicode3.toCWString() + 1) == L'\u672C');
+ 
++    String unicode4(L"\u65e5\u672c\u8a9e", String::UTF16BE);
++    CPPUNIT_ASSERT(unicode4[1] == L'\u672c');
++
++    String unicode5(L"\u65e5\u672c\u8a9e", String::UTF16LE);
++    CPPUNIT_ASSERT(unicode5[1] == L'\u2c67');
++
++    wstring stduni = L"\u65e5\u672c\u8a9e";
++
++    String unicode6(stduni, String::UTF16BE);
++    CPPUNIT_ASSERT(unicode6[1] == L'\u672c');
++
++    String unicode7(stduni, String::UTF16LE);
++    CPPUNIT_ASSERT(unicode7[1] == L'\u2c67');
++
+     CPPUNIT_ASSERT(strcmp(String::number(0).toCString(), "0") == 0);
+     CPPUNIT_ASSERT(strcmp(String::number(12345678).toCString(), "12345678") == 0);
+     CPPUNIT_ASSERT(strcmp(String::number(-12345678).toCString(), "-12345678") == 0);
+-- 
+1.8.4.2
+
diff --git a/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch b/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
new file mode 100644
index 000000000000..0b134ec82215
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-bytevector-simpler.patch
@@ -0,0 +1,131 @@
+From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
+From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
+Date: Thu, 14 Nov 2013 14:05:32 +0900
+Subject: [PATCH 3/6] Rewrote ByteVector::replace() simpler
+
+---
+ taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++---------------------------
+ tests/test_bytevector.cpp      |  5 +++
+ 2 files changed, 33 insertions(+), 49 deletions(-)
+
+diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
+index b658246..566a20f 100644
+--- a/taglib/toolkit/tbytevector.cpp
++++ b/taglib/toolkit/tbytevector.cpp
+@@ -31,6 +31,7 @@
+ #include <iostream>
+ #include <cstdio>
+ #include <cstring>
++#include <cstddef>
+ 
+ #include <tstring.h>
+ #include <tdebug.h>
+@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit
+   if(pattern.size() == 0 || pattern.size() > size())
+     return *this;
+ 
+-  const uint withSize = with.size();
+-  const uint patternSize = pattern.size();
+-  int offset = 0;
++  const size_t withSize    = with.size();
++  const size_t patternSize = pattern.size();
++  const ptrdiff_t diff = withSize - patternSize;
++  
++  size_t offset = 0;
++  while (true)
++  {
++    offset = find(pattern, offset);
++    if(offset == static_cast<size_t>(-1)) // Use npos in taglib2.
++      break;
+ 
+-  if(withSize == patternSize) {
+-    // I think this case might be common enough to optimize it
+     detach();
+-    offset = find(pattern);
+-    while(offset >= 0) {
+-      ::memcpy(data() + offset, with.data(), withSize);
+-      offset = find(pattern, offset + withSize);
+-    }
+-    return *this;
+-  }
+ 
+-  // calculate new size:
+-  uint newSize = 0;
+-  for(;;) {
+-    int next = find(pattern, offset);
+-    if(next < 0) {
+-      if(offset == 0)
+-        // pattern not found, do nothing:
+-        return *this;
+-      newSize += size() - offset;
+-      break;
++    if(diff < 0) {
++      ::memmove(
++        data() + offset + withSize, 
++        data() + offset + patternSize, 
++        size() - offset - patternSize);
++      resize(size() + diff);
+     }
+-    newSize += (next - offset) + withSize;
+-    offset = next + patternSize;
+-  }
+-
+-  // new private data of appropriate size:
+-  ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0);
+-  char *target = DATA(newData);
+-  const char *source = data();
+-
+-  // copy modified data into new private data:
+-  offset = 0;
+-  for(;;) {
+-    int next = find(pattern, offset);
+-    if(next < 0) {
+-      ::memcpy(target, source + offset, size() - offset);
+-      break;
++    else if(diff > 0) {
++      resize(size() + diff);
++      ::memmove(
++        data() + offset + withSize, 
++        data() + offset + patternSize, 
++        size() - diff - offset - patternSize);
+     }
+-    int chunkSize = next - offset;
+-    ::memcpy(target, source + offset, chunkSize);
+-    target += chunkSize;
+-    ::memcpy(target, with.data(), withSize);
+-    target += withSize;
+-    offset += chunkSize + patternSize;
+-  }
+ 
+-  // replace private data:
+-  if(d->deref())
+-    delete d;
++    ::memcpy(data() + offset, with.data(), with.size());
+ 
+-  d = newData;
++    offset += withSize;
++    if(offset > size() - patternSize)
++      break;
++  }
+ 
+   return *this;
+ }
+diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
+index 9efd23a..eca74f8 100644
+--- a/tests/test_bytevector.cpp
++++ b/tests/test_bytevector.cpp
+@@ -239,6 +239,11 @@ public:
+       a.replace(ByteVector("ab"), ByteVector());
+       CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a);
+     }
++    {
++      ByteVector a("abcdabf");
++      a.replace(ByteVector("bf"), ByteVector("x"));
++      CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a);
++    }
+   }
+ 
+ };
+-- 
+1.8.4.2
+
diff --git a/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch b/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
new file mode 100644
index 000000000000..9cdbdcf00fbd
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-missing-deletes.patch
@@ -0,0 +1,48 @@
+From c14a3b5c3d0831f7c113d0cf95840c4671d9ebd4 Mon Sep 17 00:00:00 2001
+From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
+Date: Tue, 13 May 2014 20:07:02 +0900
+Subject: [PATCH] Added some missing deletes to test_flac.cpp.
+
+---
+ tests/test_flac.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/test_flac.cpp b/tests/test_flac.cpp
+index caec715..364fb11 100644
+--- a/tests/test_flac.cpp
++++ b/tests/test_flac.cpp
+@@ -91,6 +91,7 @@ public:
+     newpic->setData("JPEG data");
+     f->addPicture(newpic);
+     f->save();
++    delete f;
+ 
+     f = new FLAC::File(newname.c_str());
+     lst = f->pictureList();
+@@ -138,6 +139,7 @@ public:
+     f->removePictures();
+     f->addPicture(newpic);
+     f->save();
++    delete f;
+ 
+     f = new FLAC::File(newname.c_str());
+     lst = f->pictureList();
+@@ -165,6 +167,7 @@ public:
+ 
+     f->removePictures();
+     f->save();
++    delete f;
+ 
+     f = new FLAC::File(newname.c_str());
+     lst = f->pictureList();
+@@ -185,6 +188,7 @@ public:
+     tag->setTitle("NEW TITLE 2");
+     f->save();
+     CPPUNIT_ASSERT_EQUAL(String("NEW TITLE 2"), tag->title());
++    delete f;
+ 
+     f = new FLAC::File(newname.c_str());
+     tag = f->tag();
+-- 
+1.9.0
+
diff --git a/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch b/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
new file mode 100644
index 000000000000..86d5201e54d4
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.9.1-order-big-endian.patch
@@ -0,0 +1,33 @@
+From db3e961d1098d5efe57364f540f68a5996dc83c2 Mon Sep 17 00:00:00 2001
+From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
+Date: Tue, 13 May 2014 18:22:16 +0900
+Subject: [PATCH] Fixed a wrong byte order handling on big-endian machines.
+
+---
+ taglib/toolkit/tstring.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
+index 603455a..1ec083b 100644
+--- a/taglib/toolkit/tstring.cpp
++++ b/taglib/toolkit/tstring.cpp
+@@ -47,10 +47,14 @@
+ 
+ namespace 
+ {
+-
+   inline unsigned short combine(unsigned char c1, unsigned char c2)
+   {
+-    return (c1 << 8) | c2;
++    using namespace TagLib::Utils;
++
++    if(SystemByteOrder == LittleEndian)
++      return (c1 << 8) | c2;
++    else
++      return (c2 << 8) | c1;
+   }
+ 
+   void UTF16toUTF8(const wchar_t *src, size_t srcLength, char *dst, size_t dstLength)
+-- 
+1.9.0
+