diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-28 08:29:51 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-28 08:29:51 +0000 |
| commit | 3a04cb0bd2b2567156a4c6ec48c62dffbd6264b3 (patch) | |
| tree | 38192f8ee0667264aa42b4d67f3b8fea8d143b9a /media-sound | |
| parent | Version bump. Respect CFLAGS and add debug use flag. (diff) | |
| download | gentoo-2-3a04cb0bd2b2567156a4c6ec48c62dffbd6264b3.tar.gz gentoo-2-3a04cb0bd2b2567156a4c6ec48c62dffbd6264b3.tar.bz2 gentoo-2-3a04cb0bd2b2567156a4c6ec48c62dffbd6264b3.zip | |
Add support for libmp4v2 revision r479.
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/mixxx/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch | 28 | ||||
| -rw-r--r-- | media-sound/mixxx/mixxx-1.10.0.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog index d27087a64bd7..8fad55dbbe08 100644 --- a/media-sound/mixxx/ChangeLog +++ b/media-sound/mixxx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/mixxx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.55 2012/03/20 21:47:03 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.56 2012/03/28 08:29:51 radhermit Exp $ + + 28 Mar 2012; Tim Harder <radhermit@gentoo.org> mixxx-1.10.0.ebuild, + +files/mixxx-1.10.0-libmp4v2_r479_compat.patch: + Add support for libmp4v2 revision r479. *mixxx-1.10.0 (20 Mar 2012) diff --git a/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch b/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch new file mode 100644 index 000000000000..c0d395d48917 --- /dev/null +++ b/media-sound/mixxx/files/mixxx-1.10.0-libmp4v2_r479_compat.patch @@ -0,0 +1,28 @@ +--- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c ++++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4.c +@@ -114,7 +114,11 @@ + faacDecSetConfiguration(priv->decoder, neaac_cfg); + + /* open mpeg-4 file */ ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ priv->mp4.handle = MP4Read(ip_data->filename); ++#else + priv->mp4.handle = MP4Read(ip_data->filename, 0); ++#endif + if (!priv->mp4.handle) { + d_print("MP4Read failed\n"); + goto out; +--- mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp ++++ mixxx-1.10.0/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp +@@ -164,7 +164,11 @@ + faacDecSetConfiguration(priv->decoder, neaac_cfg); + + /* open mpeg-4 file */ ++#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */ ++ priv->mp4.handle = MP4Read(ip_data->filename); ++#else + priv->mp4.handle = MP4Read(ip_data->filename, 0); ++#endif + if (!priv->mp4.handle) { + qDebug() << "MP4Read failed"; + goto out; diff --git a/media-sound/mixxx/mixxx-1.10.0.ebuild b/media-sound/mixxx/mixxx-1.10.0.ebuild index e10cafa6c770..04579486dc0f 100644 --- a/media-sound/mixxx/mixxx-1.10.0.ebuild +++ b/media-sound/mixxx/mixxx-1.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.1 2012/03/20 21:47:03 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.0.ebuild,v 1.2 2012/03/28 08:29:51 radhermit Exp $ EAPI=4 @@ -49,6 +49,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-cflags.patch epatch "${FILESDIR}"/${P}-docs.patch epatch "${FILESDIR}"/${P}-no-bzr.patch + epatch "${FILESDIR}"/${P}-libmp4v2_r479_compat.patch # use multilib compatible directory for plugins sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die |