media-video/ffmpeg: Do not infer --cpu option from mtune CFLAG.

mtune is meant for optimizing code but not generating specific instructions. ffmpeg --cpu option is for generating specific instuctions.
Bug #577078 by gentoobugs@mysteryvortex.com.

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index 3593fbdb1fe498c5df5f669a3a4467b070b47adb..146a372267b0a827745c154d2fb0039371224907 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
@@ -364,7 +364,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(get-flag march) ; do
                [[ ${i} = native ]] && i="host" # bug #273421
                myconf+=( --cpu=${i} )
                break

diff --git a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
index 4432056eb38c473f89be955f0468f0c73283c548..4cfdb943835160a117ac86090d8ab0f3cd0a9c98 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.4.ebuild
@@ -364,7 +364,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(get-flag march) ; do
                [[ ${i} = native ]] && i="host" # bug #273421
                myconf+=( --cpu=${i} )
                break

diff --git a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
index cd122a660c1f53c8c351b034d42480a5cbc46059..9d520366dd02a30ccc97f71fdbfca7d51df0ccef 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.5.ebuild
@@ -369,7 +369,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(get-flag march) ; do
                [[ ${i} = native ]] && i="host" # bug #273421
                myconf+=( --cpu=${i} )
                break

diff --git a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
index 5737bce7e21e8ea1c47b4a10637bd2972376bb89..ef2179dfccbf38482d9f84eb6bfe1221ad04d991 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.6.ebuild
@@ -369,7 +369,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(get-flag march) ; do
                [[ ${i} = native ]] && i="host" # bug #273421
                myconf+=( --cpu=${i} )
                break

diff --git a/media-video/ffmpeg/ffmpeg-3.0.ebuild b/media-video/ffmpeg/ffmpeg-3.0.ebuild
index 9fbf3efe29b69a6b27d58e0cd381c4f6a5c12be0..fd5dd6f44171ff213c242fac1f9ad85b8a4a68ea 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.0.ebuild
@@ -370,7 +370,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(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 31e83554f7454ec9b02f038c0ba1c47371ea22e4..c97b7cc705565c31130b49c2e2f542e18a4a6a5b 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -370,7 +370,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 mcpu) $(get-flag march) $(get-flag mtune) ; do
+       for i in $(get-flag mcpu) $(get-flag march) ; do
                [[ ${i} = native ]] && i="host" # bug #273421
                myconf+=( --cpu=${i} )
                break