[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Sam James]

commit:     8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 23:51:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 23:51:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7f4ca1

media-video/ffmpeg: don't force -fdiagnostics-color=auto

Previously overrode e.g. =always or =never set by user as it
appeared after user flags.

Reported-by: xxc3nsoredxx
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild | 5 +++++
 media-video/ffmpeg/ffmpeg-5.0.1.ebuild    | 5 +++++
 media-video/ffmpeg/ffmpeg-9999.ebuild     | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
index c7b310986593..c6fc34c5e8c3 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
@@ -344,6 +344,11 @@ src_prepare() {
        eapply "${FILESDIR}/vmaf-models-default-path.patch"
 
        default
+
+       # -fdiagnostics-color=auto gets appended after user flags which
+       # will ignore user's preference.
+       sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
        echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
 }
 

diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild 
b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index abdb3b553fae..ed3c25df3c42 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -351,6 +351,11 @@ src_prepare() {
        eapply "${FILESDIR}/vmaf-models-default-path.patch"
 
        default
+
+       # -fdiagnostics-color=auto gets appended after user flags which
+       # will ignore user's preference.
+       sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
        echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
 }
 

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b8ab241af568..a65128aa1741 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -348,6 +348,11 @@ src_prepare() {
        fi
 
        default
+
+       # -fdiagnostics-color=auto gets appended after user flags which
+       # will ignore user's preference.
+       sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
        echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
 }