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 | 49 |
3 files changed, 5 insertions, 121 deletions
diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog index 0d58e8658cb2..a32889a27575 100644 --- a/media-sound/kid3/ChangeLog +++ b/media-sound/kid3/ChangeLog @@ -1,6 +1,10 @@ # 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.67 2012/07/10 20:03:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.68 2012/07/10 20:05:43 johu Exp $ + + 10 Jul 2012; Johannes Huber <johu@gentoo.org> + -files/kid3-2.0.1-mp4v2-1.9.1_p479.patch, -kid3-2.0.1.ebuild: + Remove old. 10 Jul 2012; Agostino Sarubbo <ago@gentoo.org> kid3-2.1.ebuild: Stable for amd64, wrt bug #425518 @@ -269,4 +273,3 @@ 26 Apr 2004; Dominik Stadler <centic@gentoo.org> : Add new ebuild for kid3, see Bug 23014. - 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 deleted file mode 100644 index 3f213eccb287..000000000000 --- a/media-sound/kid3/files/kid3-2.0.1-mp4v2-1.9.1_p479.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 170280d726c2..000000000000 --- a/media-sound/kid3/kid3-2.0.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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.5 2012/06/11 11:13:49 ago Exp $ - -EAPI=4 -KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW" -KDE_REQUIRED="always" -KDE_HANDBOOK="optional" -inherit kde4-base - -DESCRIPTION="A simple tag editor for KDE" -HOMEPAGE="http://kid3.sourceforge.net/" -SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="amd64 x86" -IUSE="flac mp3 mp4 +taglib vorbis" - -RDEPEND=" - flac? ( - media-libs/flac[cxx] - media-libs/libvorbis - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2:0 ) - taglib? ( media-libs/taglib ) - vorbis? ( media-libs/libvorbis )" -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) - $(cmake-utils_use_with mp3 ID3LIB) - $(cmake-utils_use_with mp4 MP4V2) - $(cmake-utils_use_with vorbis) - $(cmake-utils_use_with taglib) - "-DWITH_TUNEPIMP=OFF" - "-DWITH_KDE=ON" - ) - - kde4-base_src_configure -} |