Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
Date: Sun, 30 May 2021 10:13:24
Message-Id: 1622369556.31e3918f3db9351651fd8d4b787097c08a0ccafc.sam@gentoo
1 commit: 31e3918f3db9351651fd8d4b787097c08a0ccafc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 30 10:12:28 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun May 30 10:12:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e3918f
7
8 media-video/ffmpeg: fix libatomic on arm/ppc
9
10 Closes: https://bugs.gentoo.org/790590
11 Closes: https://bugs.gentoo.org/782811
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 media-video/ffmpeg/ffmpeg-4.4.ebuild | 8 ++++++++
15 1 file changed, 8 insertions(+)
16
17 diff --git a/media-video/ffmpeg/ffmpeg-4.4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.ebuild
18 index 111ef05ca3d..aa2fd13df6e 100644
19 --- a/media-video/ffmpeg/ffmpeg-4.4.ebuild
20 +++ b/media-video/ffmpeg/ffmpeg-4.4.ebuild
21 @@ -451,6 +451,13 @@ multilib_src_configure() {
22 $(multilib_native_enable manpages)
23 )
24
25 + local extra_libs
26 + if use arm || use ppc ; then
27 + # bug #782811
28 + # bug #790590
29 + extra_libs+="-latomic "
30 + fi
31 +
32 set -- "${S}/configure" \
33 --prefix="${EPREFIX}/usr" \
34 --libdir="${EPREFIX}/usr/$(get_libdir)" \
35 @@ -465,6 +472,7 @@ multilib_src_configure() {
36 --ranlib="$(tc-getRANLIB)" \
37 --pkg-config="$(tc-getPKG_CONFIG)" \
38 --optflags="${CFLAGS}" \
39 + --extra-libs="${extra_libs}" \
40 $(use_enable static-libs static) \
41 "${myconf[@]}" \
42 ${EXTRA_FFMPEG_CONF}