summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Raschbacher <lordvan@gentoo.org>2004-06-09 20:55:00 +0000
committerThomas Raschbacher <lordvan@gentoo.org>2004-06-09 20:55:00 +0000
commit8dbaf2b85a1dd215d4495a60c3ebab7482d28b1e (patch)
tree3db7692f2d65c3afb5c0f41067766b545bc5d054 /media-video/ffmpeg
parentadd metadata (Manifest recommit) (diff)
downloadgentoo-2-8dbaf2b85a1dd215d4495a60c3ebab7482d28b1e.tar.gz
gentoo-2-8dbaf2b85a1dd215d4495a60c3ebab7482d28b1e.tar.bz2
gentoo-2-8dbaf2b85a1dd215d4495a60c3ebab7482d28b1e.zip
only enable faac when we are not on ia64 or alpha in src_compile
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9e7993fcb9cb..797f39994a03 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.36 2004/06/09 15:02:44 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.37 2004/06/09 20:55:00 lordvan Exp $
+
+ 09 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+ ffmpeg-0.4.8.20040322-r1.ebuild:
+ only enable faac when we are not on ia64 or alpha in src_compile
*ffmpeg-0.4.8.20040322-r1 (09 Jun 2004)
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 a04564940dfa..ad67c7a9bd33 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# 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.1 2004/06/09 15:02:44 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.2 2004/06/09 20:55:00 lordvan Exp $
inherit eutils flag-o-matic
@@ -51,7 +51,9 @@ src_compile() {
use encode && myconf="${myconf} --enable-mp3lame"
use oggvorbis && myconf="${myconf} --enable-vorbis"
use faad && myconf="${myconf} --enable-faad --enable-faadbin"
- use faac && myconf="${myconf} --enable-faac"
+ if [ !use ia64 || !use alpha ]; then
+ use faac && myconf="${myconf} --enable-faac"
+ fi
use dvd && myconf="${myconf} --enable-a52"
use static || myconf="${myconf} --enable-shared"
use sdl || myconf="${myconf} --disable-ffplay"