commit: ae30e7d8ba570f3953dc7f9834369d8e28d34945 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Thu Sep 11 00:52:14 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Thu Sep 11 01:00:31 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae30e7d8
media-video/ffmpeg-chromium: don't pass `--cpu=host` on arm64 Upstream configure explicitly barfs if you do this, and `-march=native` is still passed in from CFLAGS anyway. Longer term we probably need to drop `--cpu` entirely and sync up with the main ffmpeg ebuild, which has been redone. Bug: https://bugs.gentoo.org/830165 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-135.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-136.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-137.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-138.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-139.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-140.ebuild | 8 ++++++-- media-video/ffmpeg-chromium/ffmpeg-chromium-141.ebuild | 6 +++++- media-video/ffmpeg-chromium/ffmpeg-chromium-142.ebuild | 6 +++++- 9 files changed, 46 insertions(+), 10 deletions(-) diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild index 8c96ebf83ed4..742cf029d74a 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-134.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-135.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-135.ebuild index df06109af2c2..884a5a6d5b89 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-135.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-135.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-136.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-136.ebuild index 0eade061fd39..c61fa264adfd 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-136.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-136.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-137.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-137.ebuild index 30a242567195..22c09751b889 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-137.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-137.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-138.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-138.ebuild index 970709e89cbc..d912e2dffce3 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-138.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-138.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-139.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-139.ebuild index cbc14b58293b..bcd53093e39b 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-139.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-139.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-140.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-140.ebuild index f2f615eca910..15ec36c7b9ed 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-140.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-140.ebuild @@ -16,7 +16,7 @@ LICENSE=" " SLOT="${PV}" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar) @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-141.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-141.ebuild index 90eab4a2f4cc..5c510752ada4 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-141.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-141.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-142.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-142.ebuild index 90eab4a2f4cc..5c510752ada4 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-142.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-142.ebuild @@ -158,7 +158,11 @@ src_configure() { # will just ignore it. for i in $(get-flag mcpu) $(get-flag march) ; do [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) + if use arm64; then # 830165 - 'host' explicitly not supported on arm64 + [[ ${i} != host ]] && myconf+=( --cpu=${i} ) + else + myconf+=( --cpu=${i} ) + fi break done
