summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-07-07 20:39:09 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-07-07 20:39:09 +0000
commitb0cf5a70732f64e4e4f3453d6f6b55c9669b3409 (patch)
tree8807f0a9381a7014bccc69141061bda4f6698e56 /media-video
parentFix einfo for bug #207798 (diff)
downloadgentoo-2-b0cf5a70732f64e4e4f3453d6f6b55c9669b3409.tar.gz
gentoo-2-b0cf5a70732f64e4e4f3453d6f6b55c9669b3409.tar.bz2
gentoo-2-b0cf5a70732f64e4e4f3453d6f6b55c9669b3409.zip
Fix build failure when disabling MMX, which would fail to disable MMX2 code on processors supporting it, resulting in #ifdef spaghetti build failure. Bug 229981.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog8
-rw-r--r--media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild4
2 files changed, 9 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7a9ce6a87cde..95898c319551 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.219 2008/04/20 07:28:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.220 2008/07/07 20:39:09 loki_val Exp $
+
+ 07 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+ ffmpeg-0.4.9_p20080326.ebuild:
+ Fix build failure when disabling MMX, which would fail to disable MMX2
+ code on processors supporting it, resulting in #ifdef spaghetti build
+ failure. Bug 229981.
20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+files/ffmpeg-arm-pld.patch, ffmpeg-0.4.9_p20070616.ebuild,
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild
index 4da5e7af78ce..5eb2bd8d3137 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.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-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.2 2008/04/07 22:14:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.3 2008/07/07 20:39:09 loki_val Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -71,7 +71,7 @@ src_compile() {
#disable mmx accelerated code if not requested, or if PIC is required
# as the provided asm decidedly is not PIC.
if ( gcc-specs-pie || ! use mmx ) ; then
- myconf="${myconf} --disable-mmx"
+ myconf="${myconf} --disable-mmx --disable-mmx2"
fi
# enabled by default