Detect and compile with libmp4v2 >= 1.9.0.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 466ff4b0c799..a50280250923 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/kid3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.39 2009/05/21 13:09:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.40 2009/07/12 22:41:59 ssuominen Exp $
+
+*kid3-1.2-r1 (12 Jul 2009)
+
+  12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r1.ebuild,
+  +files/kid3-1.2-new_libmp4v2.patch:
+  Detect and compile with libmp4v2 >= 1.9.0.
 
   21 May 2009; Samuli Suominen <ssuominen@gentoo.org> -kid3-1.1.ebuild,
   kid3-1.2.ebuild:
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 1ec3e368e3b0..789a4979d2df 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,6 +1,8 @@
+AUX kid3-1.2-new_libmp4v2.patch 3662 RMD160 5289363f8771c0702b4ca08344fd2dbe141c7ef1 SHA1 7076917aa9182890e57285fe895ef2f78f5b92cd SHA256 400151730eff8a98ac225787653c2cc6a2cf5b3a0fe9e9782b876c9749dd3f18
 DIST kid3-1.0.tar.gz 1132898 RMD160 8677ff27081ffbcdc07424244111acc67c605f28 SHA1 6a342cce0d7c71a454e0232aa9a2ee6e84b0246d SHA256 ff8cd366682d2a5e35e45de48f393f611439d5408b83ec2d782cbd79c2e00876
 DIST kid3-1.2.tar.gz 1381577 RMD160 3df2b29de8204611f1621c3764487263442f0531 SHA1 267eaab450293a722d146c1511c0bbc24cd5e286 SHA256 55959970708c720574f25420215f6ff43ed468df7905ae45517d6b1dc07ffa6f
 EBUILD kid3-1.0.ebuild 1343 RMD160 d73d2b08e9d5e63c3afc8ce7fe84b8e9a4205c34 SHA1 40323eb445e503d877dd80eb65bc4e6b7eeea7bd SHA256 3b52af242c093d356eca763fa3e359b7e11b260e5159e3f7855dc441602cb42b
+EBUILD kid3-1.2-r1.ebuild 693 RMD160 5cdd051b2bc79543f42381e0740004be494de7ba SHA1 9f8074df151bae2dc944521d239ca7decfb07b5b SHA256 863efd6fd5ed4c72a7ab89d951e5b9c8b2a9fce5a018d94aa2744e8d67f82bce
 EBUILD kid3-1.2.ebuild 631 RMD160 f64bcb28f2f562873ef504a8b08ca0000b9970bc SHA1 86b759f8b0f9095156afc1a914ee7b753f6d69e7 SHA256 bdf89c6bafcce65ef761ad70c129274c7a11a7d4d6fe7b4ea34946d2c2d7fec2
-MISC ChangeLog 5516 RMD160 6192e3b470d9d692682a7ca06f67504a34f00c22 SHA1 3a4da695e451e45fa340767c3753a6752dc6f6dd SHA256 1f0c30c66e86c73d2eba446829218c20c9ac9eb52ec48c45d8aa137009cc16fd
+MISC ChangeLog 5703 RMD160 34208f0d704ffe97cdbb60ecb691500915b6e5a8 SHA1 81b3fb4943980c4b723dbd9764797a510127d36c SHA256 132c65d2bacbbf119a174a08399d13481c1b1b277a29885ca7ff019ed5d2d0e2
 MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
diff --git a/media-sound/kid3/files/kid3-1.2-new_libmp4v2.patch b/media-sound/kid3/files/kid3-1.2-new_libmp4v2.patch
new file mode 100644
index 000000000000..9742af4818b7
--- /dev/null
+++ b/media-sound/kid3/files/kid3-1.2-new_libmp4v2.patch
@@ -0,0 +1,78 @@
+FIXME. Detect and build with MP4V2 1.9.0. Uncompatible with old version,
+since the headers checking should be done based on version.
+
+diff -ur kid3-1.2.orig/CMakeLists.txt kid3-1.2/CMakeLists.txt
+--- kid3-1.2.orig/CMakeLists.txt	2008-03-12 22:24:35.000000000 +0200
++++ kid3-1.2/CMakeLists.txt	2009-07-13 01:38:25.000000000 +0300
+@@ -45,7 +45,7 @@
+ ### Check for mp4v2
+ set(MP4V2_LIBRARIES)
+ if(WITH_MP4V2)
+-  find_path(MP4V2_INCLUDE_DIR mp4.h
++  find_path(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h
+    /usr/include/
+    /usr/local/include/
+   )
+@@ -63,7 +63,7 @@
+ 
+     set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
+     set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${MP4V2_LIBRARIES})
+-    CHECK_CXX_SOURCE_COMPILES("#include <mp4.h>\nint main() {\n  MP4FileHandle hFile;\n  u_int32_t index;\n  char* ppName;\n  u_int8_t* ppValue;\n  u_int32_t pValueSize;\n  MP4GetMetadataByIndex(hFile, index, &ppName, &ppValue, &pValueSize);\n  return 0;\n}\n" HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG)
++    CHECK_CXX_SOURCE_COMPILES("#include <mp4v2/mp4v2.h>\n#include <sys/types.h>\nint main() {\n  MP4FileHandle hFile;\n  u_int32_t index;\n  char* ppName;\n  u_int8_t* ppValue;\n  u_int32_t pValueSize;\n  MP4GetMetadataByIndex(hFile, index, &ppName, &ppValue, &pValueSize);\n  return 0;\n}\n" HAVE_MP4V2_MP4GETMETADATABYINDEX_CHARPP_ARG)
+     set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP})
+ 
+   else (MP4V2_INCLUDE_DIR AND MP4V2_LIBRARIES)
+diff -ur kid3-1.2.orig/configure.in.in kid3-1.2/configure.in.in
+--- kid3-1.2.orig/configure.in.in	2009-04-02 20:44:10.000000000 +0300
++++ kid3-1.2/configure.in.in	2009-07-13 00:57:38.000000000 +0300
+@@ -62,7 +62,7 @@
+   ac_cppflags_save=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS -I."
+   AC_CHECK_HEADERS(systems.h)
+-  AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [],
++  AC_CHECK_HEADERS([mp4v2/mp4v2.h], [have_mp4_h=yes], [],
+     [#ifdef HAVE_SYSTEMS_H
+      # include <systems.h>
+      #endif
+@@ -99,7 +99,7 @@
+     AC_LANG_SAVE
+     AC_LANG_CPLUSPLUS
+   cat > conftest.$ac_ext <<EOF
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ int main() {
+   MP4FileHandle hFile;
+   u_int32_t index;
+diff -ur kid3-1.2.orig/doc/en/index.docbook kid3-1.2/doc/en/index.docbook
+--- kid3-1.2.orig/doc/en/index.docbook	2009-04-26 19:52:47.000000000 +0300
++++ kid3-1.2/doc/en/index.docbook	2009-07-13 00:59:34.000000000 +0300
+@@ -1463,7 +1463,7 @@
+  files. These three formats are also supported by
+ <ulink url="http://developer.kde.org/~wheeler/taglib.html">TagLib</ulink>,
+ which can also handle MPC, MP2, Speex, TrueAudio and WavPack files. 
+-<ulink url="http://mpeg4ip.sourceforge.net">mp4v2</ulink> is required for
++<ulink url="http://code.google.com/p/mp4v2">mp4v2</ulink> is required for
+ MP4 files.
+ For MusicBrainz support,
+ <ulink url="http://musicbrainz.org/doc/libtunepimp">libtunepimp</ulink>
+diff -ur kid3-1.2.orig/kid3/m4afile.cpp kid3-1.2/kid3/m4afile.cpp
+--- kid3-1.2.orig/kid3/m4afile.cpp	2008-12-22 11:57:24.000000000 +0200
++++ kid3-1.2/kid3/m4afile.cpp	2009-07-13 01:36:31.000000000 +0300
+@@ -42,10 +42,16 @@
+ #include <utime.h>
+ #endif
+ #include <stdio.h>
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ #include <cstdlib>
+ #include <cstring>
+ 
++/** FIXME. Define MP4V2 project version to MPEG4IP project version. */
++#if defined MP4V2_PROJECT_version_major && MP4V2_PROJECT_version_minor
++#define MPEG4IP_MAJOR_VERSION 0x1
++#define MPEG4IP_MINOR_VERSION 0x9
++#endif
++
+ /** MPEG4IP version as 16-bit hex number with major and minor version. */
+ #if defined MPEG4IP_MAJOR_VERSION && defined MPEG4IP_MINOR_VERSION
+ #define MPEG4IP_MAJOR_MINOR_VERSION ((MPEG4IP_MAJOR_VERSION << 8) | MPEG4IP_MINOR_VERSION)
diff --git a/media-sound/kid3/kid3-1.2-r1.ebuild b/media-sound/kid3/kid3-1.2-r1.ebuild
new file mode 100644
index 000000000000..f8562dcce797
--- /dev/null
+++ b/media-sound/kid3/kid3-1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.2-r1.ebuild,v 1.1 2009/07/12 22:41:59 ssuominen Exp $
+
+EAPI=2
+inherit kde4-base
+
+DESCRIPTION="A simple ID3 tag editor for QT/KDE."
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/id3lib
+	media-libs/taglib
+	>=media-libs/libmp4v2-1.9.0
+	media-libs/libvorbis
+	media-libs/flac[cxx]
+	media-libs/musicbrainz:3
+	media-libs/tunepimp"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-new_libmp4v2.patch" )