diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-10-01 01:46:48 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-10-01 01:46:48 +0000 |
| commit | f10925af545de79d332bb441ef79c8009ef366d1 (patch) | |
| tree | e7536ba04a12945bb1c4a631196b2d7ad6db5e96 /media-video/ffmpeg | |
| parent | version bump (diff) | |
| download | historical-f10925af545de79d332bb441ef79c8009ef366d1.tar.gz historical-f10925af545de79d332bb441ef79c8009ef366d1.tar.bz2 historical-f10925af545de79d332bb441ef79c8009ef366d1.zip | |
disable mmx and other asm if pic is requested on x86 only
Package-Manager: portage-2.2_rc88/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index b5f6182e8fe7..5612d17f0913 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.372 2010/10/01 00:56:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.373 2010/10/01 01:46:48 aballier Exp $ + + 01 Oct 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + disable mmx and other asm if pic is requested on x86 only 01 Oct 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild, metadata.xml: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 6a57b03bb50e..d68f8fdef650 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,13 +7,13 @@ DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d EBUILD ffmpeg-0.6.ebuild 7788 RMD160 9e1e01720dcb806273d2c436e3b44b565f247d7d SHA1 2acb99ffd56c1c560d5567f0e8c5cc48fb6e6dd6 SHA256 31e9d704fd4562a8b2c5a932e0dfc72295929296ab428113d00d5c7693b89c05 -EBUILD ffmpeg-9999.ebuild 7901 RMD160 d312a0065c6c5c03b236a34c2522b2a564d44fd5 SHA1 eeee10dbd758b7ac06a5058f61d49d30635e4ccb SHA256 b4546d1cbfa03cb6d94dfc8924302e633e447702f23fdff75a2207fd7a6f53d0 -MISC ChangeLog 55528 RMD160 3f4209581233efaee46648b7ef7d4c62310a2740 SHA1 42f0a80473dad191133bc8034ab88a1c2dd331c8 SHA256 2bedf64b38ee73d6439292485fe57066ab57eceb816dc644663fc542b9e39fb1 +EBUILD ffmpeg-9999.ebuild 7914 RMD160 2b04b839d28c3df22cbabcc2e1b5392d1c4e34a6 SHA1 121ecafc84e4ee8cff3b28d4ec374f68452a60af SHA256 df255584ab0485a87736c1b0e18ab48e7ac06cd0365249f6f725e9d37fe397b7 +MISC ChangeLog 55661 RMD160 c59ef1468ebb0c48ec696541c7f478ccf7c1966c SHA1 e4517eea4b0defde5d3826f784c38a53b51641fb SHA256 dc20babc02f39459a20231dc93cdb078d4d11298aa3b2461ace04fdd65c44512 MISC metadata.xml 2116 RMD160 881f00e64f73bbdd20d5017bba99d34fb96e7d6a SHA1 17780b8d193967be4835ff2fee71f3bcd6ff77f4 SHA256 f5ff02d46c6d928807a03062eeee3320eba15682f5b0a2f633e07d7c2340fe08 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkylMdMACgkQvFcC4BYPU0resACfQARAXqJ00kFlsaYZ1gmynE1r -ZZ0AnjCuJkPZhExRqMS7cbWp5s+xcJlT -=Y8om +iEYEARECAAYFAkylPY4ACgkQvFcC4BYPU0p6KQCguikZSWBWj48wKsn5u46G322m +ZpgAoMZQXbDWUowZrihPxXoKYLzeDkm3 +=9BOh -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index ef69705baca6..0a6fdc7c7c45 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.21 2010/10/01 00:56:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.22 2010/10/01 01:46:48 aballier Exp $ EAPI="2" @@ -158,8 +158,8 @@ src_configure() { use 3dnow || myconf="${myconf} --disable-amd3dnow" use 3dnowext || myconf="${myconf} --disable-amd3dnowext" # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC. - if gcc-specs-pie ; then + # as the provided asm decidedly is not PIC for x86. + if use pic && use x86 ; then myconf="${myconf} --disable-mmx --disable-mmx2" fi |