diff options
Diffstat (limited to 'media-sound/kid3')
| -rw-r--r-- | media-sound/kid3/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch | 70 | ||||
| -rw-r--r-- | media-sound/kid3/kid3-2.0.1.ebuild | 6 |
3 files changed, 81 insertions, 2 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/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) |