From ff03bc49755e47cb8ce2726e314399b981eac3cf Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 12 Jul 2008 08:43:07 +0000 Subject: backport a patch from upstream to fix runtime error with recent ffmpegs (Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) --- media-libs/mlt/ChangeLog | 6 +++++- media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch | 13 +++++++++++++ media-libs/mlt/mlt-0.2.4-r2.ebuild | 3 ++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch (limited to 'media-libs/mlt') diff --git a/media-libs/mlt/ChangeLog b/media-libs/mlt/ChangeLog index 62f1a370e9ac..49a33f001bf3 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.22 2008/07/12 07:56:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/ChangeLog,v 1.23 2008/07/12 08:43:07 aballier Exp $ + + 12 Jul 2008; Alexis Ballier + +files/mlt-0.2.4-avfreestatic.patch, mlt-0.2.4-r2.ebuild: + backport a patch from upstream to fix runtime error with recent ffmpegs 12 Jul 2008; Alexis Ballier mlt-0.2.4-r2.ebuild: disable kino support when we don't have quicktime or dv, it fails with gcc diff --git a/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch b/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch new file mode 100644 index 000000000000..9455a89db593 --- /dev/null +++ b/media-libs/mlt/files/mlt-0.2.4-avfreestatic.patch @@ -0,0 +1,13 @@ +Index: mlt/src/modules/avformat/factory.c +=================================================================== +--- mlt/src/modules/avformat/factory.c (revision 1034) ++++ mlt/src/modules/avformat/factory.c (revision 1035) +@@ -60,7 +60,7 @@ + void avformat_destroy( void *ignore ) + { + // Clean up +- av_free_static( ); ++ // av_free_static( ); -XXX this is deprecated + + // Destroy the mutex + pthread_mutex_destroy( &avformat_mutex ); diff --git a/media-libs/mlt/mlt-0.2.4-r2.ebuild b/media-libs/mlt/mlt-0.2.4-r2.ebuild index 54a07b61353a..15648b6e0fd1 100644 --- a/media-libs/mlt/mlt-0.2.4-r2.ebuild +++ b/media-libs/mlt/mlt-0.2.4-r2.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.2.4-r2.ebuild,v 1.3 2008/07/12 07:56:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mlt/mlt-0.2.4-r2.ebuild,v 1.4 2008/07/12 08:43:07 aballier Exp $ inherit eutils toolchain-funcs qt3 @@ -56,6 +56,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-bashism.patch epatch "${FILESDIR}"/${P}-double-fps.patch epatch "${FILESDIR}"/${P}-gcc-4.3.patch + epatch "${FILESDIR}"/${P}-avfreestatic.patch } src_compile() { -- cgit v1.2.3-65-gdbad