From: Simon Stelling Date: Fri, 16 Feb 2007 11:57:24 +0000 (+0000) Subject: depend on >=portage-2.1.2 on amd64 to make sure the mmx USE flag is unmasked X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07d848909f61efab82552a6e49c47c361591187b;p=gentoo.git depend on >=portage-2.1.2 on amd64 to make sure the mmx USE flag is unmasked Package-Manager: portage-2.1.2-r9 --- 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 + 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 ffmpeg-0.4.9_p20070129.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 47130705cf36..e66d93583cc1 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a files/0.4.8-gcc3.4-magicF2W.patch 994 @@ -78,18 +75,18 @@ EBUILD ffmpeg-0.4.9_p20060816.ebuild 5522 RMD160 618c67d546336305c011789f5ab3744 MD5 d33ef3c2c96ca8823101faf669f20913 ffmpeg-0.4.9_p20060816.ebuild 5522 RMD160 618c67d546336305c011789f5ab3744b5410c1f0 ffmpeg-0.4.9_p20060816.ebuild 5522 SHA256 21e8b54593a8084447c106664853576c9299c8acf6f81717592c1bd1633b2c76 ffmpeg-0.4.9_p20060816.ebuild 5522 -EBUILD ffmpeg-0.4.9_p20061016.ebuild 5589 RMD160 e3f6568eda56881e781071c9146f781a2a5521c4 SHA1 0dc9a4e62a8eaf1616f9d30823a07b1594f6487d SHA256 6eea3336b01aaca4b75eac5cf7057d73f0d970700a704218447f648d89efbd21 -MD5 0c1d13cf87bc6c2e627d3e77e17ad044 ffmpeg-0.4.9_p20061016.ebuild 5589 -RMD160 e3f6568eda56881e781071c9146f781a2a5521c4 ffmpeg-0.4.9_p20061016.ebuild 5589 -SHA256 6eea3336b01aaca4b75eac5cf7057d73f0d970700a704218447f648d89efbd21 ffmpeg-0.4.9_p20061016.ebuild 5589 -EBUILD ffmpeg-0.4.9_p20070129.ebuild 5601 RMD160 7ee80a98dbd4bffc061660da0d10ae94bc1fa728 SHA1 b0869d6a79409ac5f237b0c16e61cf331162e577 SHA256 12a042fedbd8b44f147fffcd4729b99f70e2f551d5298f36c7fef2f397fdc675 -MD5 65d92bb42f5874c1e4b57baacc762e31 ffmpeg-0.4.9_p20070129.ebuild 5601 -RMD160 7ee80a98dbd4bffc061660da0d10ae94bc1fa728 ffmpeg-0.4.9_p20070129.ebuild 5601 -SHA256 12a042fedbd8b44f147fffcd4729b99f70e2f551d5298f36c7fef2f397fdc675 ffmpeg-0.4.9_p20070129.ebuild 5601 -MISC ChangeLog 27018 RMD160 6863b155da2d6b443cae49a6750b78be52a405ed SHA1 724562f8ceb79dc7a100cfc6aad76315fde33ade SHA256 1135e79a6f57fcedc44c091ae1e6fb704dca64dd308cf5951188b87970030226 -MD5 3790146f2b87a4d8b81e101891f7ecfd ChangeLog 27018 -RMD160 6863b155da2d6b443cae49a6750b78be52a405ed ChangeLog 27018 -SHA256 1135e79a6f57fcedc44c091ae1e6fb704dca64dd308cf5951188b87970030226 ChangeLog 27018 +EBUILD ffmpeg-0.4.9_p20061016.ebuild 5726 RMD160 2aa5f316bb30e30ad8b8d772f3a8e268cc66aa93 SHA1 9cd6ef3097be5e9f93deb92f24218c39bf48d68f SHA256 13d4113b34dab278dd40a56e48dc9fdb9188a5b24e062fb9831ad91824d7b1d1 +MD5 7e3b34f6ccefb7a08a7caf115bf7469e ffmpeg-0.4.9_p20061016.ebuild 5726 +RMD160 2aa5f316bb30e30ad8b8d772f3a8e268cc66aa93 ffmpeg-0.4.9_p20061016.ebuild 5726 +SHA256 13d4113b34dab278dd40a56e48dc9fdb9188a5b24e062fb9831ad91824d7b1d1 ffmpeg-0.4.9_p20061016.ebuild 5726 +EBUILD ffmpeg-0.4.9_p20070129.ebuild 5738 RMD160 913ad7c3ce31b924d75e2d4f8451ce6bb1e8bf4a SHA1 543357742ffb25fe14dd9f2602e4bd56b8080bef SHA256 97c70e2153cfb97be71402b030a2b89a9048428e96862d3bfc01954128ca8a36 +MD5 51939fadb2732135f49aadde5d79081b ffmpeg-0.4.9_p20070129.ebuild 5738 +RMD160 913ad7c3ce31b924d75e2d4f8451ce6bb1e8bf4a ffmpeg-0.4.9_p20070129.ebuild 5738 +SHA256 97c70e2153cfb97be71402b030a2b89a9048428e96862d3bfc01954128ca8a36 ffmpeg-0.4.9_p20070129.ebuild 5738 +MISC ChangeLog 27209 RMD160 fb27f5ae6976554cf5e2b4f0294a95a45a5dd485 SHA1 401413acc47c185c7110ff9372fc00ca70f9c770 SHA256 948e3040ba84c70e52877539d90f8b096f661380427a6d3d3fd8f5cfeb39a68d +MD5 4c453f57b6a8f64cc447160c28a67eca ChangeLog 27209 +RMD160 fb27f5ae6976554cf5e2b4f0294a95a45a5dd485 ChangeLog 27209 +SHA256 948e3040ba84c70e52877539d90f8b096f661380427a6d3d3fd8f5cfeb39a68d ChangeLog 27209 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223 @@ -115,10 +112,3 @@ SHA256 5dcd53524d59a5cefe43d9370d98f64c4345e9e32b4711576c7cbc9aba72db4b files/di MD5 0fc5917b138e748590720ba627ae3fb1 files/digest-ffmpeg-0.4.9_p20070129 714 RMD160 d53b7828787e6c5924a35cbcc9807502dbb26a36 files/digest-ffmpeg-0.4.9_p20070129 714 SHA256 da375dbb878be25e06a73e390e5fbc10fa32966adf9ef3670e9c4202e6871e62 files/digest-ffmpeg-0.4.9_p20070129 714 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF0E188bi6rjpTunYRAln+AJ4hFQuLDRnEvLrZTBX+QuwU8a3j1QCg0yIL -7zs4nbn6OocZuDsQASVj0p8= -=B3LB ------END PGP SIGNATURE----- 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