diff options
| author |   Thomas Raschbacher <lordvan@gentoo.org> | 2004-06-09 20:55:00 +0000 |
|---|---|---|
| committer | Thomas Raschbacher <lordvan@gentoo.org> | 2004-06-09 20:55:00 +0000 |
| commit | cecb24aeb2d26662c1dfaacb8615ef9b3270ff03 (patch) | |
| tree | 28cac11ef79d02fff865f291be273615fc761af6 /media-video | |
| parent | add metadata (diff) | |
| download | historical-cecb24aeb2d26662c1dfaacb8615ef9b3270ff03.tar.gz historical-cecb24aeb2d26662c1dfaacb8615ef9b3270ff03.tar.bz2 historical-cecb24aeb2d26662c1dfaacb8615ef9b3270ff03.zip | |
only enable faac when we are not on ia64 or alpha in src_compile
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 4 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild | 6 |
3 files changed, 11 insertions, 5 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/Manifest b/media-video/ffmpeg/Manifest index ae1908edac3a..8b961ee9f5ff 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,9 +1,9 @@ MD5 84a27708e863d4c3fe8f2c99f1a05a40 ffmpeg-0.4.8.20040222.ebuild 3300 MD5 c47ffd4762bbd81606974cc39a507a87 ffmpeg-0.4.8.ebuild 2387 MD5 30631e1531d6673bfa478354d4e31bb9 ffmpeg-0.4.8.20040322.ebuild 3293 -MD5 a5564abcd3e498dc6a23497227dd0614 ffmpeg-0.4.8.20040322-r1.ebuild 3411 +MD5 a4e5d9b51da1ae418450b18f456d66e6 ffmpeg-0.4.8.20040322-r1.ebuild 3457 MD5 f08417b78b86be6de292fd739077ef67 ffmpeg-0.4.7.ebuild 2182 -MD5 00468dba8d8d836d30273e0dbc9480b5 ChangeLog 5546 +MD5 5fa140fb7c983486b0fdadd6c33afd48 ChangeLog 5704 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491 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" |