diff options
| author |   Sam James <sam@gentoo.org> | 2022-04-08 00:51:48 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-08 00:51:48 +0100 |
| commit | 8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a (patch) | |
| tree | ef1ec2779ff1ef2af2d7fc31c49fb985eb03d92c /media-video | |
| parent | app-emacs/editorconfig-emacs: also autoload editorconfig-apply (diff) | |
| download | gentoo-8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a.tar.gz gentoo-8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a.tar.bz2 gentoo-8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a.zip | |
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@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-5.0.1.ebuild | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 5 |
3 files changed, 15 insertions, 0 deletions
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 } |