diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-11-10 12:09:10 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-11-10 12:09:10 +0000 |
| commit | 5144c0b788a10da963a7b92906bce00dd35f8ad0 (patch) | |
| tree | 2a60cb2f93553673cf0d20b798d9c7bb4ef9ed85 | |
| parent | version bump, by Andrej Gelenberg <a_gel@web.de>, bug #245997 (diff) | |
| download | gentoo-2-5144c0b788a10da963a7b92906bce00dd35f8ad0.tar.gz gentoo-2-5144c0b788a10da963a7b92906bce00dd35f8ad0.tar.bz2 gentoo-2-5144c0b788a10da963a7b92906bce00dd35f8ad0.zip | |
fix build with sox 14.2.0
(Portage version: 2.2_rc13/cvs/Linux 2.6.27.5 x86_64)
| -rw-r--r-- | media-libs/mlt/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-0.3.0-sox1420.patch | 19 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-0.3.0.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog index 9cefcecf8563..f1ac55490c06 100644 --- a/media-libs/mlt/ChangeLog +++ b/media-libs/mlt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mlt # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.29 2008/11/04 19:07:29 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.30 2008/11/10 12:09:10 aballier Exp $ + + 10 Nov 2008; Alexis Ballier <aballier@gentoo.org> + +files/mlt-0.3.0-sox1420.patch, mlt-0.3.0.ebuild: + fix build with sox 14.2.0 04 Nov 2008; Alexis Ballier <aballier@gentoo.org> mlt-0.2.4-r2.ebuild: fix ffmpeg deps for bug #245467 diff --git a/media-libs/mlt/files/mlt-0.3.0-sox1420.patch b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch new file mode 100644 index 000000000000..3421ab2b82ef --- /dev/null +++ b/media-libs/mlt/files/mlt-0.3.0-sox1420.patch @@ -0,0 +1,19 @@ +Index: mlt-0.3.0/src/modules/sox/filter_sox.c +=================================================================== +--- mlt-0.3.0.orig/src/modules/sox/filter_sox.c ++++ mlt-0.3.0/src/modules/sox/filter_sox.c +@@ -33,9 +33,13 @@ + # define ST_SUCCESS SOX_SUCCESS + # define st_sample_t sox_sample_t + # define eff_t sox_effect_t* +-# define st_size_t sox_size_t + # define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE + # define ST_LIB_VERSION SOX_LIB_VERSION ++#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0)) ++# define st_size_t size_t ++#else ++# define st_size_t sox_size_t ++#endif + # define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips) + #if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0)) + # define ST_SSIZE_MIN SOX_SAMPLE_MIN diff --git a/media-libs/mlt/mlt-0.3.0.ebuild b/media-libs/mlt/mlt-0.3.0.ebuild index 038fe44b8a38..0725ab2d346a 100644 --- a/media-libs/mlt/mlt-0.3.0.ebuild +++ b/media-libs/mlt/mlt-0.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.0.ebuild,v 1.2 2008/10/18 08:37:09 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.3.0.ebuild,v 1.3 2008/11/10 12:09:10 aballier Exp $ EAPI=1 @@ -54,6 +54,7 @@ src_unpack() { epatch "${FILESDIR}"/mlt-0.2.3-nostrip.patch epatch "${FILESDIR}"/${P}-sox1410.patch epatch "${FILESDIR}"/${P}-avcodec.patch + epatch "${FILESDIR}"/${P}-sox1420.patch } src_compile() { |