give preference to -mcpu then -mtune then -march for setting cpu, this should match better the precision of the flags

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

5 files changed, 19 insertions, 14 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index bf5a083fe17b..773e9bab8993 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.807 2014/11/04 09:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.808 2014/11/04 09:48:43 aballier Exp $
+
+  04 Nov 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.10.ebuild,
+  ffmpeg-2.4.3.ebuild, ffmpeg-9999.ebuild:
+  give preference to -mcpu then -mtune then -march for setting cpu, this should
+  match better the precision of the flags
 
   04 Nov 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.10.ebuild,
   ffmpeg-2.4.3.ebuild, ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6abc5d47a3a6..3d67fb27b9ff 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -16,15 +16,15 @@ EBUILD ffmpeg-0.10.15.ebuild 9938 SHA256 d4c3b812f56c3c610c42709836c2263912b4118
 EBUILD ffmpeg-1.0.10.ebuild 9661 SHA256 8e268c28be34d501171171af761494f37a26a8fe84293e9b8a05cf8bfd56ac76 SHA512 79781c15c09bff885f6f193e361bf8f929eca66903575fdfdb1188afc5d69c3bb6d0bd232d5eced7f4ac4a9c2f3aaff59a4164024e38bbd7f4c0a2c4a074c008 WHIRLPOOL 84e24bfc65736aa714a5506c9e8b1fa9e6ddc91e0c06e991e4598cdf1b85c1da68317fded1374fbfa6076f7a81c0da0cded87d7e3e9f2a1427d5218a59482fcf
 EBUILD ffmpeg-1.2.6-r1.ebuild 10971 SHA256 744922812b304456ca62be21ba8241ad45508cb2ece3421a65874f48c8da54e1 SHA512 52473418fb4eb13735ff2a69f1771d5371ade710fe1cd3c4578e1fe3231165ab5774ad23681aa1f083e396282d0690a3fb09ece623feff39786bdcc6177eb952 WHIRLPOOL 73bc7685d5fd0d6e68f4914e246f6de991cd826ea4e952320450aaecd803ec873606e27495ce3892ef78de777f0d7292dfcd4e42873be2a7712df09a1fe11918
 EBUILD ffmpeg-1.2.9.ebuild 10929 SHA256 7f8efcf95b404dc68d6e1ca867d2a751d159c6eb225136965497f3dd71f90fef SHA512 586e74091bcf30fc3ccf9b526dcf65cd6971a1bb73e2bdc0db80a6b70f39a3a86d678c923b7c1bf25f9c588d6ac037a41715d94fba23c66a12d92ab93ba156ed WHIRLPOOL b539e057094f9df79b2b10df5af6a513278ca3cd31856080cad433041426f549df96d3fb6d7dcdb97226a91a55e23a85409578a2fe89317d70e19c51c59901c8
-EBUILD ffmpeg-2.2.10.ebuild 12608 SHA256 d05fa55e5ce4f4b4a88c0b4eb95fc20d1c1bf077839be86b7f2d5cdeed3e84fa SHA512 0bdb411d66333a1dd4e52ba97e100cb8ee4e149d2a5b14efb7c37c98babf548892ab7e6a315be0b860dd40213e3ec71cc8c47da68242f7b8a23a6910fee23e18 WHIRLPOOL 1c9b09202b2870c3c2fb056bbc65fd68072df659789e2a88f53bcdaf1b7f62766fc2aa8088f0b364c0f634c3cb26fe3d6b1c47dac0700411362060fbb4890726
-EBUILD ffmpeg-2.4.3.ebuild 12981 SHA256 62ea44bdf2ae44469cee6c750ce14160135c95f96ea7b52a4343c81170d68844 SHA512 ce299f77f2671b7e34e52beb912cd2fad2b4559fb2aacdecca8c795c2fd31d5c9c6597644f2c17c8f9a6be8c07ca721f55ef20742858ad970a4a12b614f6e890 WHIRLPOOL cbb32e02a166a3cb4c78911ee1b2385cf147a67224b17787ca9c8a369e3c4e440ba080273fa77c5e8b2c0086c809e45b74926d7fcb221c6bffffdd8fcfdb999e
-EBUILD ffmpeg-9999.ebuild 13076 SHA256 083d6cd9e7d7c720b54d22f7d189991e9c1461607d21a75c3f461970935b1b46 SHA512 5f2f985a7b32ef4112f5dc6012868803fc07c4b2891112058dd16d2c857268264ad672341a1f1fd1554c251e40cb1c954e1d6f31a72c89dfa23e33f799aa4c7b WHIRLPOOL 31f7841b9983f7b4b14377b609c56ab17e22063d1a6a1ff50ead65d9c9469069eae7d76180a792fadb5ed93ca9680563988b93df0a55313e10b26f8299deff3e
-MISC ChangeLog 111664 SHA256 5f85f192b4baa90895a48aad38400c116d86a6571ebb82f30dbd33951d02fa80 SHA512 8660264e695a63dea8f5d6ba843574749643efe160a14482af621423731e62ad37d119827f67cf2ffafdd965326d160e1a22ff9358f817e4c555aa93580c7528 WHIRLPOOL d957313128dc66268a09c37ef7f36f50db7b36a837a7048119a3f24212e5aedbe1d18ea456d672c72fd698685b58f53e0d99d3025d069c7a4d65653565e9aac5
+EBUILD ffmpeg-2.2.10.ebuild 12608 SHA256 85c51534b63cf37f4515b341f4008d5966207ba2d0300828b08958e6ddd92fe2 SHA512 0833b848dcbab24e57a439c5177baa30c997eb91fd7f88d5ae16d3aef9785d1407a5360aa0e2ff70130812434071154ab1916e672a903bd75558f88e25a8550e WHIRLPOOL 3fb135cb5f92a7158bf969e63d8dbc8f7fdb685317a6920e11100adc370979a10d7e9c4cdafe4bae8862719c514edce53f1fcd0ce71cfc90137916f91730faba
+EBUILD ffmpeg-2.4.3.ebuild 12981 SHA256 52cda2b043ae1f91dea6807219e31618d1bb273b7efc7e6a7039b166926dca5f SHA512 ad6332923a6bf4aa5da93f9a2105febcbba44fe5f299d84dc486369e42291e6ec13808d58e42a1c1f94afa49060e5999b2d84a8098e7cd6aec9595811767edc9 WHIRLPOOL 16168726ff1ee37e084ef899bd360d3903081eaad9a8e6bfad837defd846cd93ef99d152e3d7aaa5b0b01ebac838edc3d5e01ae89273ad1b4782a15a991f623b
+EBUILD ffmpeg-9999.ebuild 13076 SHA256 bac15fc30d7fc2f4a2a4db916c61466aaa26da128fd88bd99155040928551899 SHA512 f0b9b7b8d6d3bc0990a0a85e0219f98af176b5dd87e1f98981f6a337e821aa0d9657e836b296bdd51b4febfd7d3dc04bb2f7cf32a3c1024eb21fba71e9927048 WHIRLPOOL b51c96f1ebb6fd2b87e9494d5e6023decb3c875024ef836974b83a6cf76fc65a2601b596f5a67ed3aa098836dd862d548db02a48e928fae7c9ed6f66ccef7f99
+MISC ChangeLog 111904 SHA256 207a79fc1447cfed05c9e747a10d0ef6eebe5bd339079ba6189e4e179f09a774 SHA512 a0a604e5b755a94677928f78ca10007e78c50d32608ee3e1224bfe1176ca6e59d800ff529ad8a90a629fe653498177b782e8fcbafbf003cc5fa4838ce2cbdedb WHIRLPOOL 40bea8f309bad49c56bdd585ddad9d405e12f9014a2121dc37cc7d9f71652c2653b24896257ea72d1cbc2fadd156d1442592abaeae31979647afe8d4de80a0ff
 MISC metadata.xml 5647 SHA256 359e839a7d9c3c36825bfae0e9217688785d279cebbfc440bd4074f5bc58fb9c SHA512 3efe9374ca61952911a6593417494092d9fd5465745a63e427dc74cbd6aa4af46277ec4865603daf5b27163c8db97823ff2b4eb857e88d73f3278e63a949e372 WHIRLPOOL fc5873ea67edea764b6ffff08862ad850a4bef83daed4a1ac03fc2cd9cfb8cb587561ce8fdee39a79fd6686b4605bebaaa0c00dac6a858e5d6f5ac563751ea20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRYmkUACgkQvFcC4BYPU0padwCaAhbEZrVzU9+u4SVWEW+5Spx6
-YaEAnRnUaKsb5s6o0rPCnvl08a+1KFc5
-=neCk
+iEYEAREIAAYFAlRYoPwACgkQvFcC4BYPU0pYSQCeKoydyiPaH4eQaMnQNeMWwwNf
+DXoAn2XtnjlCfBNP7rq2Sqjaklh4J15K
+=WFfA
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.10.ebuild b/media-video/ffmpeg/ffmpeg-2.2.10.ebuild
index a25383f1bc3e..6d490fbc01b9 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.10.ebuild,v 1.2 2014/11/04 09:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.10.ebuild,v 1.3 2014/11/04 09:48:43 aballier Exp $
 
 EAPI="5"
 
@@ -289,7 +289,7 @@ multilib_src_configure() {
 	# We need to do this so that features of that CPU will be better used
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
 		[[ ${i} = native ]] && i="host" # bug #273421
 		myconf+=( --cpu=${i} )
 		break
diff --git a/media-video/ffmpeg/ffmpeg-2.4.3.ebuild b/media-video/ffmpeg/ffmpeg-2.4.3.ebuild
index 033310925f68..462fe2209bd1 100644
--- a/media-video/ffmpeg/ffmpeg-2.4.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.4.3.ebuild,v 1.2 2014/11/04 09:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.4.3.ebuild,v 1.3 2014/11/04 09:48:43 aballier Exp $
 
 EAPI="5"
 
@@ -288,7 +288,7 @@ multilib_src_configure() {
 	# We need to do this so that features of that CPU will be better used
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
 		[[ ${i} = native ]] && i="host" # bug #273421
 		myconf+=( --cpu=${i} )
 		break
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index eb52a537c5cc..e925dce4e483 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.175 2014/11/04 09:20:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.176 2014/11/04 09:48:43 aballier Exp $
 
 EAPI="5"
 
@@ -289,7 +289,7 @@ multilib_src_configure() {
 	# We need to do this so that features of that CPU will be better used
 	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
 	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+	for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
 		[[ ${i} = native ]] && i="host" # bug #273421
 		myconf+=( --cpu=${i} )
 		break