Add upstream patch to fix build with snapshot version of media-libs/libmp4v2, fixes bug #409511.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 91 insertions, 11 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 6d4764f80b88..44f42945e01d 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.57 2012/01/08 00:19:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.58 2012/04/16 08:03:59 johu Exp $
+
+  16 Apr 2012; Johannes Huber <johu@gentoo.org>
+  +files/kid3-2.0.1-mp4v2-1.9.1_p479.patch, kid3-2.0.1.ebuild:
+  Add upstream patch to fix build with snapshot version of media-libs/libmp4v2,
+  fixes bug #409511.
 
 *kid3-2.0.1 (08 Jan 2012)
 
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 3d6675dab14d..809e816098ab 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX kid3-2.0.1-mp4v2-1.9.1_p479.patch 2568 RMD160 d1bb544588c3721e7381e2e082443481263b3446 SHA1 9fb29eab466cd0b310e8eac2792ab9f4e2a21cda SHA256 85fa8d8ca2d1d99925237f5b8a4096434bf0e9cee4d8e6a6691d9716ab03db61
 DIST kid3-1.4.tar.gz 1539244 RMD160 c73090e90d7c785d33b4e10d6ff5f75d525aeb30 SHA1 4c53ac9f23449c6643bf3d9d7547978c41146922 SHA256 dc3f79617cfe2e3fcc3414542d65424ea22864b289d93f3552853c2ba14df418
 DIST kid3-1.6.tar.gz 1478393 RMD160 7ad7aaf58957be112cea2b2b4962b81fdbb6b6e9 SHA1 64701fa5ee575c6f66e4d0fb70fdaf6c16e54a82 SHA256 974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2
 DIST kid3-2.0.1.tar.gz 805506 RMD160 cfbd8e1103f6211c3ca74e84135c9f1ad055e271 SHA1 951864e665b3b40c7020dcce38de6186cf4a7e12 SHA256 32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e
 DIST kid3-2.0.tar.gz 804587 RMD160 746f585575e700e95df6fd3a48b664db9e654de6 SHA1 4e3ec0a98fbba20325fb93d2dcafb86595652c30 SHA256 bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd
 EBUILD kid3-1.4.ebuild 1147 RMD160 f9ca57bfb5f9c1781a60853013fe658e5215a0d5 SHA1 b58a2dfc45ad2101f3ca60925598b59fa75c6245 SHA256 f47d1a1dc926b42926253fc386f93f245c0e3639db9d48114f3f778c0128c637
 EBUILD kid3-1.6.ebuild 1109 RMD160 c35767ba77d3fdf83e0ecac8bbdac8950f111545 SHA1 3427514293bae0a6b57104e93e73d06ab4700ebe SHA256 dc53ae7f18d4c7626aa5c0ca18c1c2672409b190e09631aca881187af427add0
-EBUILD kid3-2.0.1.ebuild 1084 RMD160 dade52647f21274425abbe0d2b19e2f2e0d9e9c8 SHA1 81fc56703020dc310e0917d41bde9366bb93316e SHA256 26b64b52c58fd485554c2c8e79486b836865d54b8b9e290cc4c036086626c5fe
+EBUILD kid3-2.0.1.ebuild 1147 RMD160 1329423b118555daad56ebd129834d91e9545f2b SHA1 e47684f9d0c15bdafb41880c1d31317c520b92c8 SHA256 ea252719acfaae50f36fa6b133333db9b35e17c9923569f7c611bc08fa7901d4
 EBUILD kid3-2.0.ebuild 1087 RMD160 379c3f1462cb433d25a73dab229779a267a0e8f0 SHA1 5516bc33738aabc3b14454652a15f18a8a162412 SHA256 e75f4318b7c991db8d68536718e1e44917c1a12dc8edb4410447154d86f6d2c3
-MISC ChangeLog 7796 RMD160 ec63425bec5fd77c35638e3d9ab7ef9b676fb8e9 SHA1 97c4e7d81106fe682190798a40e89ebb77bb804b SHA256 f1298d44765444627919215722c6667ed56cece255691ca1fbd8963212d853fd
+MISC ChangeLog 8009 RMD160 bd80f1f520329271b1b9b5101222318f07ec66e6 SHA1 369153db3a3a4fdff688f2d10d7e90e64838c28d SHA256 693beb92079e3a8e3150a67031cea8079d98dc53f9ea9784efac70773d3bb518
 MISC metadata.xml 179 RMD160 224e1883835fc791f44fdef156866625e02ef60d SHA1 607ee34e3564d7e6d8e0ada382cf18c0315ba5fb SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPCOGyAAoJEO+t9ga+3I3aJBcH/3wtoWqdmI0giQ2ygnqwzxyg
-D9++w9mp1/gNKPWU+Agia2VXYUGVnQr36vFocMTpNi7HQwaRdtlMzUhGXKNKeq1g
-v3t/1tTdWQf6CKmwzig6JQGEK24Dd1rbfShHoQkz15ch7DFGvt0lM0qGUpNFPY+d
-tQzxvcQXLNcU0EshWCoz90AWsbgotZxlat++MxNpf8BSR4I3jdZ2Tg9cEI10VurN
-5m5AC0akWCx18MMvpF5HghPy+y+W7CtGpLq2vWEF64dEc7LuUuD3kMOCUTcPCQ1F
-PkQ9SYIRj2nwqlPqyb5CcZecFnFe/uij/Qxrjrgy9K/rG6weAdcgWnDdlI8SncI=
-=RAQg
+iQEcBAEBCgAGBQJPi9KcAAoJEO+t9ga+3I3aXu4H/3gAyzHn60pATl0PuojrxmIu
+8GprbxAl0/+9uW98/knb0DmXTnbwQyijJr1yESB1XiAZkPXNl7oSIikReDGTnmq6
+G8+l0w9HV73Upku9eBXFedcGmBoQW+AeQ0DFvXZiOhUyPVPANSefIc9tiSm0mAFf
+ZOdJENVOcGJTNO/K69jXAM5hwQXAUIP9+/btLUIko+5taOPEyWLUlF4Y6rjr2lW8
+Zi2q0SdPf1Sk9M+k/8jMmDA3vWM44ra4R6P5zqlkfaj2wEUAkuEO12K2qKL/4fjt
+SwVRMdAceJLwNAJ2VVqfAtxtnnmGy0o6twoHRzumy2VueVAYRRVnVLht+DpyhJ8=
+=jhT3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch b/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch
new file mode 100644
index 000000000000..3f213eccb287
--- /dev/null
+++ b/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch
@@ -0,0 +1,70 @@
+From e4ab371868f1a23d31f26234ffde6b4cc6594a0a Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <ufleisch@users.sourceforge.net>
+Date: Sun, 1 Apr 2012 18:04:56 +0200
+Subject: [PATCH 1/1] Support building with mp4v2-trunk-r479.
+
+---
+ src/core/formats/m4afile.cpp |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/formats/m4afile.cpp b/src/core/formats/m4afile.cpp
+index 0b79728..bf50beb 100644
+--- a/src/core/formats/m4afile.cpp
++++ b/src/core/formats/m4afile.cpp
+@@ -57,6 +57,13 @@
+ #define MPEG4IP_MAJOR_MINOR_VERSION 0x0009
+ #endif
+ 
++#if MPEG4IP_MAJOR_MINOR_VERSION < 0x0200
++#define MP4TagsSetContentID MP4TagsSetCNID
++#define MP4TagsSetArtistID MP4TagsSetATID
++#define MP4TagsSetPlaylistID MP4TagsSetPLID
++#define MP4TagsSetGenreID MP4TagsSetGEID
++#endif
++
+ /**
+  * Constructor.
+  *
+@@ -240,7 +247,9 @@ static Frame::Type getTypeForName(const QString& name,
+   return Frame::FT_UnknownFrame;
+ }
+ 
+-#ifndef HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
++#if MPEG4IP_MAJOR_MINOR_VERSION >= 0x0109
++#elif defined HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG
++#else
+ /**
+  * Check if a name is a free form field.
+  *
+@@ -649,7 +658,7 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
+             MP4TagsSetCompilation(tags, &cpl);
+           } else if (name == "covr") {
+             MP4TagArtwork artwork;
+-            artwork.data = value.data();
++            artwork.data = (void *)value.data();
+             artwork.size = value.size();
+             artwork.type = MP4_ART_UNDEFINED;
+             MP4TagsAddArtwork(tags, &artwork);
+@@ -722,16 +731,16 @@ bool M4aFile::writeTags(bool force, bool* renamed, bool preserve)
+             MP4TagsSetITunesCountry(tags, &val);
+           } else if (name == "cnID") {
+             uint32_t val = str.toULong();
+-            MP4TagsSetCNID(tags, &val);
++            MP4TagsSetContentID(tags, &val);
+           } else if (name == "atID") {
+             uint32_t val = str.toULong();
+-            MP4TagsSetATID(tags, &val);
++            MP4TagsSetArtistID(tags, &val);
+           } else if (name == "plID") {
+             uint64_t val = str.toULongLong();
+-            MP4TagsSetPLID(tags, &val);
++            MP4TagsSetPlaylistID(tags, &val);
+           } else if (name == "geID") {
+             uint32_t val = str.toULong();
+-            MP4TagsSetGEID(tags, &val);
++            MP4TagsSetGenreID(tags, &val);
+           } else {
+             MP4ItmfItem* item = MP4ItmfItemAlloc("----", 1);
+             item->mean = strdup("com.apple.iTunes");
+-- 
+1.7.4.1
diff --git a/media-sound/kid3/kid3-2.0.1.ebuild b/media-sound/kid3/kid3-2.0.1.ebuild
index 71279539fdbc..13a530c16d16 100644
--- a/media-sound/kid3/kid3-2.0.1.ebuild
+++ b/media-sound/kid3/kid3-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-2.0.1.ebuild,v 1.1 2012/01/08 00:19:03 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-2.0.1.ebuild,v 1.2 2012/04/16 08:03:59 johu Exp $
 
 EAPI=4
 KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}"
 
 REQUIRED_USE="flac? ( vorbis )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.1-mp4v2-1.9.1_p479.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with flac)