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, 06 Feb 2022 22:42:13
Message-Id: 1644187254.59de33093462eccf9d71bff5fb81a248109c9e1a.sam@gentoo
1 commit: 59de33093462eccf9d71bff5fb81a248109c9e1a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 22:40:54 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 22:40:54 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59de3309
7
8 media-video/ffmpeg: add mips, x86 (i486) to atomic workaround
9
10 See https://forums.gentoo.org/viewtopic-t-1147131.html. The MIPS case
11 was reported to me on IRC by mrhansen and I'd forgot (I was sure I had!)
12 that I hadn't updated the ebuild for it.
13
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild | 2 +-
17 media-video/ffmpeg/ffmpeg-5.0.ebuild | 2 +-
18 media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +-
19 3 files changed, 3 insertions(+), 3 deletions(-)
20
21 diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
22 index 5dbd2c460106..35cb418bf783 100644
23 --- a/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
24 +++ b/media-video/ffmpeg/ffmpeg-4.4.1-r1.ebuild
25 @@ -456,7 +456,7 @@ multilib_src_configure() {
26 )
27
28 local extra_libs
29 - if use arm || use ppc ; then
30 + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
31 # bug #782811
32 # bug #790590
33 extra_libs+="$(test-flags-CCLD -latomic) "
34
35 diff --git a/media-video/ffmpeg/ffmpeg-5.0.ebuild b/media-video/ffmpeg/ffmpeg-5.0.ebuild
36 index a6be1e984dff..80468d5d74a1 100644
37 --- a/media-video/ffmpeg/ffmpeg-5.0.ebuild
38 +++ b/media-video/ffmpeg/ffmpeg-5.0.ebuild
39 @@ -456,7 +456,7 @@ multilib_src_configure() {
40 )
41
42 local extra_libs
43 - if use arm || use ppc ; then
44 + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
45 # bug #782811
46 # bug #790590
47 extra_libs+="$(test-flags-CCLD -latomic) "
48
49 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
50 index a6be1e984dff..80468d5d74a1 100644
51 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild
52 +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
53 @@ -456,7 +456,7 @@ multilib_src_configure() {
54 )
55
56 local extra_libs
57 - if use arm || use ppc ; then
58 + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
59 # bug #782811
60 # bug #790590
61 extra_libs+="$(test-flags-CCLD -latomic) "