Patch from ArchLinux to build with libmp4v2 >= 1.6 plus a include location change to build with >= 1.9.

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

4 files changed, 45 insertions, 14 deletions

diff --git a/media-libs/tunepimp/ChangeLog b/media-libs/tunepimp/ChangeLog
index d47b6c4ccb50..2b3469008fcf 100644
--- a/media-libs/tunepimp/ChangeLog
+++ b/media-libs/tunepimp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tunepimp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.68 2009/05/29 12:14:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.69 2009/07/10 12:49:06 ssuominen Exp $
+
+  10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  tunepimp-0.5.3-r2.ebuild, +files/tunepimp-0.5.3-new_libmp4v2.patch:
+  Patch from ArchLinux to build with libmp4v2 >= 1.6 plus a include location
+  change to build with >= 1.9.
 
 *tunepimp-0.5.3-r2 (29 May 2009)
 
diff --git a/media-libs/tunepimp/Manifest b/media-libs/tunepimp/Manifest
index e71038720004..16b1320c4303 100644
--- a/media-libs/tunepimp/Manifest
+++ b/media-libs/tunepimp/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tunepimp-0.5.3-build-fix.patch 1996 RMD160 cee043ff0a2068123f47641537b99ede832827e9 SHA1 884d39899beec2dfecb77ae1a199fa2d4a084e6e SHA256 e848053e08c075c8df02fd2f48a93e9330bb790c7b8e48453c90e8e011a17e36
 AUX tunepimp-0.5.3-gcc43.patch 4810 RMD160 a180a2a703083f940a2a1bb081018a3bfef320c6 SHA1 ac441ed5903621ebea70ec9e3f4b71f6781d4a05 SHA256 d248c1a84f2157b44e714982e239d2ed93731f39b5455130a3aef422ca48842d
 AUX tunepimp-0.5.3-gcc44.patch 473 RMD160 3f4b6d0cc213ffa7ff42b3b701ae5bc3d113a5d0 SHA1 b761a9733ee6d7d0fa81b22d5b6a2819fc446d0b SHA256 5329927dc730e77040a112448772bab190c5fd8db6a93041ce4266b2e3e57a03
 AUX tunepimp-0.5.3-libtool.patch 1169 RMD160 73479770ef2b9fc320de2ed3be2c6dbbf96a7b4c SHA1 ea28badda640e0de0c7d7d7229f3dbf3fd9f46f7 SHA256 7d9b29199b7186b7b57980fd5bcb08e26e0f13e4f989dc6b8ee04e968f919b40
+AUX tunepimp-0.5.3-new_libmp4v2.patch 852 RMD160 bd36a7ccc719762df6a847d592545f59cfde7c69 SHA1 1ee35ef6c0de85eb47558f3208f089dc3e926818 SHA256 c27fd67e2c570047be63febc7c0c3d9f95ed2d23f211e4d15514241218aa929c
 DIST libtunepimp-0.5.3.tar.gz 1097005 RMD160 6bc312591b98a5b74824fc3103137cbf60d4b012 SHA1 1b904cd97ce009588fe57336f40e79b6edf9947e SHA256 341744a0be386387632fc4bb906b97d2b3346137beb2c776a41dedaeeb0f2468
 EBUILD tunepimp-0.5.3-r1.ebuild 1740 RMD160 b0ca08dd0eefc94409d32f8c366a2c54a6babe5e SHA1 03bc1f36746d308ac5b7c631ea5229c163bbf18f SHA256 c362174ba2b25cec9fe822462a33124796a3af75f86d73792b1240381e0b660c
-EBUILD tunepimp-0.5.3-r2.ebuild 1782 RMD160 0ea16187474e3b72f84600d8d51782f01df945a8 SHA1 6cfcf78ac7c3b260b1bf0a207c04d50ccad456a9 SHA256 351b2220e0bce2648818fd6cb7162b623a3c6fe04c7e2f0789966120a1981fd9
+EBUILD tunepimp-0.5.3-r2.ebuild 1907 RMD160 003d6a9221b77e95ce1aecf362875c4b7c9ae8eb SHA1 a465eddffe433e0c81c2ef79ec7611319bb7175c SHA256 fba6defdf9a739d08ed9e429cdc84e9f3f3dcdece421f1981c2718462d4eb7e4
 EBUILD tunepimp-0.5.3.ebuild 1520 RMD160 9fcbeb72d1b2a76c311ccd123a04091952cd058b SHA1 d5d3d7780ee463010fb9b278ec691a3495e760b2 SHA256 bb2d9cf6fbc64bf309ff5d23c40a0c51a6946fc8d0ec5342c47bda121bfae5e9
-MISC ChangeLog 8993 RMD160 aea688ae7005b1d755f1975ac11424dfbd69ae26 SHA1 3598d4072c18c6edd1d5fb467549aa75e8072d6f SHA256 7191b1d6bd2e5aa69248730e785f9b8bc897e3dd1686007876dc4d8ff3ab21dd
+MISC ChangeLog 9226 RMD160 47b3c0e6f7e064a6b7bc551c8a58b6a96de32a89 SHA1 32110fd39bd8df82f2edc8999818c2dabbfa5de1 SHA256 30848e99164b4a05624baa419551897a13b8339df8e007e57d0ef2fa41798325
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkof0dkACgkQHB6c3gNBRYfSpQCgvPkAzI+7qePXEf615bpStCiv
-u6AAoKzMfiIxfLsxNJOqACqIwd2u4PdM
-=l+nv
------END PGP SIGNATURE-----
diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch
new file mode 100644
index 000000000000..ec3ec72612e3
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch
@@ -0,0 +1,30 @@
+diff -ur libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp libtunepimp-0.5.3/plugins/mp4/mp4.cpp
+--- libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp	2009-07-10 15:50:20.000000000 +0300
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2009-07-10 15:51:18.000000000 +0300
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <mp4.h>
++#include <mp4v2/mp4v2.h>
+ #include "metadata.h"
+ #include "plugin.h"
+ #ifndef WIN32
+@@ -232,7 +232,7 @@
+   
+   strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); 
+   
+-  if (!MP4Close(mp4file))
++  MP4Close(mp4file);
+     return 0;
+   
+   return 1;
+@@ -316,7 +316,7 @@
+   sprintf(temp, "%d", mdata->nonAlbum);  
+   MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t *)temp, strlen(temp) + 1);
+   
+-  if (!MP4Close(mp4file))
++  MP4Close(mp4file);
+     return 0;
+ 
+ #ifndef WIN32
diff --git a/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild b/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild
index bef98d3214ad..0e85d633687d 100644
--- a/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.5.3-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-libs/tunepimp/tunepimp-0.5.3-r2.ebuild,v 1.1 2009/05/29 12:14:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild,v 1.2 2009/07/10 12:49:06 ssuominen Exp $
 
 EAPI="1"
 
@@ -26,6 +26,7 @@ RDEPEND="sys-libs/zlib
 	>=media-libs/flac-1.1.2
 	media-libs/libmad
 	>=media-libs/musicbrainz-2.1.0:1
+	media-libs/libmp4v2
 	media-libs/libofa
 	media-libs/libvorbis
 	!media-sound/trm
@@ -48,6 +49,10 @@ src_unpack() {
 
 	sed -i -e "s: tta::" configure.in
 
+	if has_version ">=media-libs/libmp4v2-1.9.0"; then
+		epatch "${FILESDIR}"/${P}-new_libmp4v2.patch
+	fi
+
 	eautoreconf
 }