diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-10 12:49:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-10 12:49:07 +0000 |
| commit | dd6807832f1a088ea7413b461a778f49d48b214e (patch) | |
| tree | da1783714fc06bf8ed265122be1c0856d17c023e /media-libs | |
| parent | Version bump (diff) | |
| download | gentoo-2-dd6807832f1a088ea7413b461a778f49d48b214e.tar.gz gentoo-2-dd6807832f1a088ea7413b461a778f49d48b214e.tar.bz2 gentoo-2-dd6807832f1a088ea7413b461a778f49d48b214e.zip | |
Patch from ArchLinux to build with libmp4v2 >= 1.6 plus a include location change to build with >= 1.9.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/tunepimp/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/tunepimp/files/tunepimp-0.5.3-new_libmp4v2.patch | 30 | ||||
| -rw-r--r-- | media-libs/tunepimp/tunepimp-0.5.3-r2.ebuild | 7 |
3 files changed, 42 insertions, 2 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/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 } |