From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1383384-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 14AAD15808B
for <garchives@archives.gentoo.org>; Thu, 7 Apr 2022 23:52:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CB9D6E0919;
Thu, 7 Apr 2022 23:52:48 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DA555E0919
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2022 23:52:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5C42A34142F
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2022 23:52:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id CF72E177
for <gentoo-commits@lists.gentoo.org>; Thu, 7 Apr 2022 23:52:43 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1649375508.8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild media-video/ffmpeg/ffmpeg-5.0.1.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild
X-VCS-Directories: media-video/ffmpeg/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a
X-VCS-Branch: master
Date: Thu, 7 Apr 2022 23:52:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1e649ba4-ccd6-40d3-849b-d29282a86360
X-Archives-Hash: c02af5a6014427fb3ad5e07ddd9a6548
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
}