From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 15 Dec 2011 11:25:11 +0000 (+0000)
Subject: disable all asm on x86 with pic, this should be much slower but, at least, pic
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5121cf105c6d82834702f10792577cd4b459b77f;p=gentoo.git

disable all asm on x86 with pic, this should be much slower but, at least, pic

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
---

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 680d5a105563..899ef800b388 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.506 2011/12/15 11:21:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.507 2011/12/15 11:25:11 aballier Exp $
+
+  15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+  disable all asm on x86 with pic, this should be much slower but, at least,
+  pic
 
   15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   remove x86 special handling, this should be handled automagically by the
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 302127cf3a2d..6272f85a892d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,13 +8,13 @@ DIST ffmpeg-0.8.7.tar.bz2 4527751 RMD160 5ccc0cfcfaf77b2f7e7cc51190d00bc22db8586
 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f
 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318
 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4
-EBUILD ffmpeg-9999.ebuild 8355 RMD160 8b3da6699131296d6b130bafb6e074b0357ec6ba SHA1 6cdc24a5b33381f3d7260fbd5e812ba019d208b0 SHA256 69240c824e5479b3590825820a9929c519912060903bf3391b48676d3ebad298
-MISC ChangeLog 72760 RMD160 3b643abf39f03cb6e2af3734d53e4d53cac554e8 SHA1 e0d50d8d66d755914ccee24a585bcf4445ea8a01 SHA256 3ed2814ef88961d2dd9c30daafaaed90290ff17afc7fd9a4d0a841a36d3be60d
+EBUILD ffmpeg-9999.ebuild 8287 RMD160 ddf5b46aa60697f102d0a4fb0b1311d9c7bf6d3c SHA1 73c53a9087ef19f984d405306e7aabb93c548d79 SHA256 23afed5b6e6464f92ada61f10e52170738e140245720474481dd684bf525988c
+MISC ChangeLog 72916 RMD160 ea41bf4947a69a367adc9b0e786167b6a71ed960 SHA1 1ad7585e89019edefc58b683a95c4104c74caf57 SHA256 31b200974d36ec889ecc0b825da126369755b5b7af22f6e35548312baae750e7
 MISC metadata.xml 3136 RMD160 83498fadc792f93d602a65caf742e4cd1c379615 SHA1 61ecdedb07c4d97cf5f3a665e9d301c07657d863 SHA256 6a36d874d9bd519aadc8c406f9f1a07b60dd35c41a41ba8484f602b87f8ed85e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7p2CkACgkQvFcC4BYPU0pbMACdEUvZvZI6fQJN7keqZAunYl6B
-Kc4An1MelGKKqZnjuL8x8fzVoVUqamRK
-=jWi8
+iEYEARECAAYFAk7p2RwACgkQvFcC4BYPU0r0hwCdGSX7FurCTEKvL0Xk0aiU+IzU
+LAgAoLwuY2BwwLjvDtr3e87EaKTsZEFR
+=wrUI
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b137ba07d3b7..07182db34393 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.70 2011/12/15 11:21:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.71 2011/12/15 11:25:11 aballier Exp $
 
 EAPI="4"
 
@@ -180,15 +180,13 @@ src_configure() {
 	for i in ${CPU_FEATURES}; do
 		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
 	done
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && use x86 ; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
+	if use pic ; then
+		myconf="${myconf} --enable-pic"
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		use x86 && myconf="${myconf} --disable-asm"
 	fi
 
-	# Option to force building pic
-	use pic && myconf="${myconf} --enable-pic"
-
 	# Try to get cpu type based on CFLAGS.
 	# Bug #172723
 	# We need to do this so that features of that CPU will be better used