diff options
| author |   Sam James <sam@gentoo.org> | 2022-10-10 00:17:37 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-10-10 00:17:37 +0100 |
| commit | 6840b4ee2d9d08d4b5e45a0d5385b7993214d575 (patch) | |
| tree | d49887443622825e69b7c93c16c2f1d2a1912add /media-video | |
| parent | sys-apps/iproute2: add 6.0.0 (diff) | |
| download | gentoo-6840b4ee2d9d08d4b5e45a0d5385b7993214d575.tar.gz gentoo-6840b4ee2d9d08d4b5e45a0d5385b7993214d575.tar.bz2 gentoo-6840b4ee2d9d08d4b5e45a0d5385b7993214d575.zip | |
media-video/ffmpeg: cleanup libatomic from 5.1.2, 9999
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.4.3.ebuild | 2 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-5.1.2.ebuild | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 10 |
3 files changed, 3 insertions, 19 deletions
diff --git a/media-video/ffmpeg/ffmpeg-4.4.3.ebuild b/media-video/ffmpeg/ffmpeg-4.4.3.ebuild index 6d1dcc3ef576..9823dcd522e1 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.3.ebuild @@ -498,6 +498,7 @@ multilib_src_configure() { $(multilib_native_enable manpages) ) + # Use --extra-libs if needed for LIBS set -- "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -513,7 +514,6 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ $(use_enable static-libs static) \ "${myconf[@]}" \ ${EXTRA_FFMPEG_CONF} diff --git a/media-video/ffmpeg/ffmpeg-5.1.2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.2.ebuild index 04786c9205ad..fe7043c164bc 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.2.ebuild @@ -498,14 +498,7 @@ multilib_src_configure() { $(multilib_native_enable manpages) ) - # Fixed in 5.0.1? Waiting for verification from someone who hit the issue. - local extra_libs - if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then - # bug #782811 - # bug #790590 - extra_libs+="$(test-flags-CCLD -latomic) " - fi - + # Use --extra-libs if needed for LIBS set -- "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -521,7 +514,6 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ $(use_enable static-libs static) \ "${myconf[@]}" \ ${EXTRA_FFMPEG_CONF} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 04786c9205ad..fe7043c164bc 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -498,14 +498,7 @@ multilib_src_configure() { $(multilib_native_enable manpages) ) - # Fixed in 5.0.1? Waiting for verification from someone who hit the issue. - local extra_libs - if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then - # bug #782811 - # bug #790590 - extra_libs+="$(test-flags-CCLD -latomic) " - fi - + # Use --extra-libs if needed for LIBS set -- "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -521,7 +514,6 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ $(use_enable static-libs static) \ "${myconf[@]}" \ ${EXTRA_FFMPEG_CONF} |