From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1445186-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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 09169158094
for <garchives@archives.gentoo.org>; Sun, 9 Oct 2022 23:19:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0E00DE0817;
Sun, 9 Oct 2022 23:19:11 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E55E0E0817
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 23:19:10 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 21E953410DB
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 23:19:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9654A606
for <gentoo-commits@lists.gentoo.org>; Sun, 9 Oct 2022 23:19:08 +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: <1665357457.6840b4ee2d9d08d4b5e45a0d5385b7993214d575.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.3.ebuild media-video/ffmpeg/ffmpeg-5.1.2.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: 6840b4ee2d9d08d4b5e45a0d5385b7993214d575
X-VCS-Branch: master
Date: Sun, 9 Oct 2022 23:19:08 +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: 855ee794-ab0c-4976-b60b-e1108369efcc
X-Archives-Hash: d09ccf372119a0518c24114093e60d0d
commit: 6840b4ee2d9d08d4b5e45a0d5385b7993214d575
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 23:17:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 23:17:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6840b4ee
media-video/ffmpeg: cleanup libatomic from 5.1.2, 9999
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/ffmpeg/ffmpeg-4.4.3.ebuild | 2 +-
media-video/ffmpeg/ffmpeg-5.1.2.ebuild | 10 +---------
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}