Support >= libmp4v2 1.9.0.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 68 insertions, 11 deletions

diff --git a/media-sound/easytag/ChangeLog b/media-sound/easytag/ChangeLog
index 1f3828e75d09..be71a403a743 100644
--- a/media-sound/easytag/ChangeLog
+++ b/media-sound/easytag/ChangeLog
@@ -1,12 +1,13 @@
 # ChangeLog for media-sound/easytag
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.130 2009/07/10 11:24:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/ChangeLog,v 1.131 2009/07/10 13:47:05 ssuominen Exp $
 
 *easytag-2.1.6-r2 (10 Jul 2009)
 
   10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
-  +easytag-2.1.6-r2.ebuild:
-  Revision bump to drop usage of obsolete libmp4v2 from mpeg4ip package.
+  easytag-2.1.6-r1.ebuild, easytag-2.1.6-r2.ebuild,
+  +files/easytag-2.1.6-new_libmp4v2.patch, metadata.xml:
+  Support >= libmp4v2 1.9.0.
 
   25 Jun 2009; Raúl Porcel <armin76@gentoo.org> easytag-2.1.6-r1.ebuild:
   sparc stable wrt #272966
diff --git a/media-sound/easytag/easytag-2.1.6-r1.ebuild b/media-sound/easytag/easytag-2.1.6-r1.ebuild
index e71b248c4302..19a762cba6c2 100644
--- a/media-sound/easytag/easytag-2.1.6-r1.ebuild
+++ b/media-sound/easytag/easytag-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r1.ebuild,v 1.7 2009/06/25 18:02:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r1.ebuild,v 1.8 2009/07/10 13:47:05 ssuominen Exp $
 
 EAPI=2
 inherit eutils fdo-mime
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ppc ppc64 sparc x86"
-IUSE="aac flac mp3 speex vorbis wavpack"
+IUSE="flac mp3 mp4 speex vorbis wavpack"
 
 RDEPEND=">=x11-libs/gtk+-2.12:2
 	mp3? ( >=media-libs/id3lib-3.8.3-r7
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.12:2
 	flac? ( media-libs/flac
 		media-libs/libvorbis )
 	vorbis? ( media-libs/libvorbis )
-	aac? ( media-libs/libmp4v2 )
+	mp4? ( <media-libs/libmp4v2-1.9.0 )
 	wavpack? ( media-sound/wavpack )
 	speex? ( media-libs/speex
 		media-libs/libvorbis )"
@@ -38,7 +38,7 @@ src_configure() {
 		$(use_enable mp3 id3v23) \
 		$(use_enable vorbis ogg) \
 		$(use_enable flac) \
-		$(use_enable aac mp4) \
+		$(use_enable mp4) \
 		$(use_enable wavpack) \
 		$(use_enable speex)
 }
diff --git a/media-sound/easytag/easytag-2.1.6-r2.ebuild b/media-sound/easytag/easytag-2.1.6-r2.ebuild
index 7a02211f5000..c01703b1ba41 100644
--- a/media-sound/easytag/easytag-2.1.6-r2.ebuild
+++ b/media-sound/easytag/easytag-2.1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r2.ebuild,v 1.1 2009/07/10 11:24:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.6-r2.ebuild,v 1.2 2009/07/10 13:47:05 ssuominen Exp $
 
 EAPI=2
 inherit eutils fdo-mime
@@ -12,13 +12,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac mp3 speex vorbis wavpack"
+IUSE="flac mp3 mp4 speex vorbis wavpack"
 
 RDEPEND=">=x11-libs/gtk+-2.12:2
 	mp3? ( >=media-libs/id3lib-3.8.3-r7
 		media-libs/libid3tag )
 	flac? ( media-libs/flac
 		media-libs/libvorbis )
+	mp4? ( >=media-libs/libmp4v2-1.9.0 )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 	speex? ( media-libs/speex
@@ -28,7 +29,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop_entry.patch
+	epatch "${FILESDIR}"/${P}-desktop_entry.patch \
+		"${FILESDIR}"/${P}-new_libmp4v2.patch
 }
 
 src_configure() {
@@ -37,7 +39,7 @@ src_configure() {
 		$(use_enable mp3 id3v23) \
 		$(use_enable vorbis ogg) \
 		$(use_enable flac) \
-		--disable-mp4 \
+		$(use_enable mp4) \
 		$(use_enable wavpack) \
 		$(use_enable speex)
 }
diff --git a/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch b/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch
new file mode 100644
index 000000000000..774bf7fb2a5b
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.6-new_libmp4v2.patch
@@ -0,0 +1,51 @@
+diff -ur easytag-2.1.6.orig/configure easytag-2.1.6/configure
+--- easytag-2.1.6.orig/configure	2008-07-12 17:57:44.000000000 +0300
++++ easytag-2.1.6/configure	2009-07-10 16:44:39.000000000 +0300
+@@ -22418,12 +22418,12 @@
+ /* end confdefs.h.  */
+ 
+                 #include <stdio.h>
+-                #include <mpeg4ip_config.h>
++                #include <mp4v2/mp4v2.h>
+                 int main (void)
+                 {
+                     FILE *output;
+                     output=fopen("conftest.mp4v2","w");
+-                    fprintf(output,"LIBMP4V2_NAME=%s\nLIBMP4V2_VERSION=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
++                    fprintf(output,"MP4V2_PROJECT_name=%s\nMP4V2_PROJECT_version=%s\n",PACKAGE_TARNAME,PACKAGE_VERSION);
+                     fclose(output);
+                     exit(0);
+                 }
+@@ -22471,7 +22471,7 @@
+ 
+                 cat >conftest.$ac_ext <<_ACEOF
+ 
+-           #include <mp4.h>
++           #include <mp4v2/mp4v2.h>
+            main () {
+            MP4FileHandle hFile;
+            MP4GetMetadataCoverArt(hFile, NULL, NULL,0); }
+diff -ur easytag-2.1.6.orig/src/mp4_header.c easytag-2.1.6/src/mp4_header.c
+--- easytag-2.1.6.orig/src/mp4_header.c	2007-11-28 10:54:35.000000000 +0200
++++ easytag-2.1.6/src/mp4_header.c	2009-07-10 16:44:54.000000000 +0300
+@@ -44,7 +44,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 
+ /****************
+diff -ur easytag-2.1.6.orig/src/mp4_tag.c easytag-2.1.6/src/mp4_tag.c
+--- easytag-2.1.6.orig/src/mp4_tag.c	2007-12-11 00:08:11.000000000 +0200
++++ easytag-2.1.6/src/mp4_tag.c	2009-07-10 16:45:08.000000000 +0300
+@@ -50,7 +50,7 @@
+ #undef PACKAGE_STRING
+ #undef PACKAGE_TARNAME
+ #undef PACKAGE_VERSION
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ 
+ 
+ /****************
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 60d33c1c5e10..99dd7bab92cd 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>
+	<use>
+		<flag name="mp4">Support for MP4 container format</flag>
+	</use>
 	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC,
 MP4 and OGG files. It features a simple and attractive GTK+
 interface</longdescription>