1 |
commit: 8b7f4ca1ba82c44b830d60aaea2f34c406f2d63a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 7 23:51:48 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 7 23:51:48 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7f4ca1 |
7 |
|
8 |
media-video/ffmpeg: don't force -fdiagnostics-color=auto |
9 |
|
10 |
Previously overrode e.g. =always or =never set by user as it |
11 |
appeared after user flags. |
12 |
|
13 |
Reported-by: xxc3nsoredxx |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild | 5 +++++ |
17 |
media-video/ffmpeg/ffmpeg-5.0.1.ebuild | 5 +++++ |
18 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 5 +++++ |
19 |
3 files changed, 15 insertions(+) |
20 |
|
21 |
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild |
22 |
index c7b310986593..c6fc34c5e8c3 100644 |
23 |
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild |
24 |
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild |
25 |
@@ -344,6 +344,11 @@ src_prepare() { |
26 |
eapply "${FILESDIR}/vmaf-models-default-path.patch" |
27 |
|
28 |
default |
29 |
+ |
30 |
+ # -fdiagnostics-color=auto gets appended after user flags which |
31 |
+ # will ignore user's preference. |
32 |
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die |
33 |
+ |
34 |
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die |
35 |
} |
36 |
|
37 |
|
38 |
diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild |
39 |
index abdb3b553fae..ed3c25df3c42 100644 |
40 |
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild |
41 |
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild |
42 |
@@ -351,6 +351,11 @@ src_prepare() { |
43 |
eapply "${FILESDIR}/vmaf-models-default-path.patch" |
44 |
|
45 |
default |
46 |
+ |
47 |
+ # -fdiagnostics-color=auto gets appended after user flags which |
48 |
+ # will ignore user's preference. |
49 |
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die |
50 |
+ |
51 |
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die |
52 |
} |
53 |
|
54 |
|
55 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
56 |
index b8ab241af568..a65128aa1741 100644 |
57 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
58 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
59 |
@@ -348,6 +348,11 @@ src_prepare() { |
60 |
fi |
61 |
|
62 |
default |
63 |
+ |
64 |
+ # -fdiagnostics-color=auto gets appended after user flags which |
65 |
+ # will ignore user's preference. |
66 |
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die |
67 |
+ |
68 |
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die |
69 |
} |