diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2007-02-16 11:57:24 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2007-02-16 11:57:24 +0000 |
| commit | 9213244122e58f18933157406d9d7906078c8b13 (patch) | |
| tree | 793cba18d29b4e77cc719659d7026c5fe871447d /media-video/ffmpeg | |
| parent | Stable on ppc64; bug #167020 (diff) | |
| download | gentoo-2-9213244122e58f18933157406d9d7906078c8b13.tar.gz gentoo-2-9213244122e58f18933157406d9d7906078c8b13.tar.bz2 gentoo-2-9213244122e58f18933157406d9d7906078c8b13.zip | |
depend on >=portage-2.1.2 on amd64 to make sure the mmx USE flag is unmasked
(Portage version: 2.1.2-r9)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 42968d60916b..db4b81461e14 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.179 2007/01/29 20:44:15 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.180 2007/02/16 11:57:24 blubb Exp $ + + 16 Feb 2007; Simon Stelling <blubb@gentoo.org> + ffmpeg-0.4.9_p20061016.ebuild, ffmpeg-0.4.9_p20070129.ebuild: + depend on >=portage-2.1.2 on amd64 to make sure the mmx USE flag is unmasked 29 Jan 2007; Steve Dibb <beandog@gentoo.org> ffmpeg-0.4.9_p20070129.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild index 3cb56e5ca2a6..34792c4276a8 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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_p20061016.ebuild,v 1.12 2007/02/12 11:19:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20061016.ebuild,v 1.13 2007/02/16 11:57:24 blubb Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -38,6 +38,9 @@ DEPEND="${RDEPEND} doc? ( app-text/texi2html ) test? ( net-misc/wget ) amr? ( app-arch/unzip )" +# Make sure the mmx USE flag is unmasked +# Remove this once default-linux/amd64/2006.1 is deprecated +DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )" src_unpack() { unpack ${A} || die @@ -93,7 +96,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 ) && ( ! use amd64 ); then + if ( gcc-specs-pie || ! use mmx ) ; then myconf="${myconf} --disable-mmx" fi diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild index 8d3c77a3f413..e873446ba110 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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_p20070129.ebuild,v 1.3 2007/02/12 11:19:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20070129.ebuild,v 1.4 2007/02/16 11:57:24 blubb Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -38,6 +38,9 @@ DEPEND="${RDEPEND} doc? ( app-text/texi2html ) test? ( net-misc/wget ) amr? ( app-arch/unzip )" +# Make sure the mmx USE flag is unmasked +# Remove this once default-linux/amd64/2006.1 is deprecated +DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )" src_unpack() { unpack ${A} || die @@ -93,7 +96,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 ) && ( ! use amd64 ); then + if ( gcc-specs-pie || ! use mmx ) ; then myconf="${myconf} --disable-mmx" fi |