diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2014-05-20 18:26:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2014-05-20 18:26:18 +0000 |
| commit | 2db4319d133972a8ce8b968649cef0208a2a3d73 (patch) | |
| tree | 4cea5fb5c2444a08883d765704ad9e94139340a1 /media-video | |
| parent | Fixes bug #510848 on behalf of Alexander Tsoy. (diff) | |
| download | gentoo-2-2db4319d133972a8ce8b968649cef0208a2a3d73.tar.gz gentoo-2-2db4319d133972a8ce8b968649cef0208a2a3d73.tar.bz2 gentoo-2-2db4319d133972a8ce8b968649cef0208a2a3d73.zip | |
fix build with USE=ladspa -frei0r, bug #510516
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-2.2.2.ebuild | 3 | ||||
| -rw-r--r-- | media-video/ffmpeg/files/ladspadl.patch | 25 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 389f186efb7b..1fc3cb2fb8b1 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.735 2014/05/19 20:23:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.736 2014/05/20 18:26:18 aballier Exp $ + + 20 May 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.2.ebuild, + +files/ladspadl.patch: + fix build with USE=ladspa -frei0r, bug #510516 19 May 2014; Jeroen Roovers <jer@gentoo.org> ffmpeg-2.2.2.ebuild: Marked ~hppa (bug #510340). diff --git a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild b/media-video/ffmpeg/ffmpeg-2.2.2.ebuild index d45a3df6e4fe..9ef733bbda90 100644 --- a/media-video/ffmpeg/ffmpeg-2.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.2.ebuild,v 1.4 2014/05/19 20:23:51 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.2.ebuild,v 1.5 2014/05/20 18:26:18 aballier Exp $ EAPI="5" @@ -162,6 +162,7 @@ src_prepare() { if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot export revision=git-N-${FFMPEG_REVISION} fi + epatch "${FILESDIR}/ladspadl.patch" epatch_user } diff --git a/media-video/ffmpeg/files/ladspadl.patch b/media-video/ffmpeg/files/ladspadl.patch new file mode 100644 index 000000000000..12fc988990e4 --- /dev/null +++ b/media-video/ffmpeg/files/ladspadl.patch @@ -0,0 +1,25 @@ +From c27dc27c50cb016d470b45c5852c884718f4769c Mon Sep 17 00:00:00 2001 +From: Alexis Ballier <aballier@gentoo.org> +Date: Tue, 20 May 2014 20:06:28 +0200 +Subject: [PATCH] Fix build with --enable-ladspa --disable-frei0r. + +https://bugs.gentoo.org/show_bug.cgi?id=510516 +--- + configure | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure b/configure +index b6d35ae..0848fed 100755 +--- a/configure ++++ b/configure +@@ -2499,6 +2499,7 @@ hqdn3d_filter_deps="gpl" + interlace_filter_deps="gpl" + kerndeint_filter_deps="gpl" + ladspa_filter_deps="ladspa dlopen" ++ladspa_filter_extralibs='$ldl' + mcdeint_filter_deps="avcodec gpl" + movie_filter_deps="avcodec avformat" + mp_filter_deps="gpl avcodec swscale inline_asm" +-- +1.9.3 + |