diff options
| author |   Daniel Goller <morfic@gentoo.org> | 2004-06-25 22:52:45 +0000 |
|---|---|---|
| committer | Daniel Goller <morfic@gentoo.org> | 2004-06-25 22:52:45 +0000 |
| commit | 217b6d4f054ad86320bc859ca3c17cca9161f056 (patch) | |
| tree | 2df7da96b0604b401e35e75cb6f6084d516429fe /media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild | |
| parent | Version bump. (Manifest recommit) (diff) | |
| download | gentoo-2-217b6d4f054ad86320bc859ca3c17cca9161f056.tar.gz gentoo-2-217b6d4f054ad86320bc859ca3c17cca9161f056.tar.bz2 gentoo-2-217b6d4f054ad86320bc859ca3c17cca9161f056.zip | |
added conditional patch to allow compiling with gcc-3.4.0, closes bug 49383
Diffstat (limited to 'media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild index 3b8e2ca6ddc6..68210b6c4de8 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.6 2004/06/25 00:40:23 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.7 2004/06/25 22:52:45 morfic Exp $ -inherit eutils flag-o-matic +inherit eutils flag-o-matic gcc # TODO: --enablea52bin breaks compile @@ -36,6 +36,13 @@ src_unpack() { # for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it cd ${S} sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c + + #this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383 + if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] + then + einfo "Compiler used: gcc-3.4.x Applying patch conditionally." + epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch + fi } src_compile() { |