From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BF24513835A for ; Thu, 2 Jul 2020 12:50:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2553E0897; Thu, 2 Jul 2020 12:50:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B545E0897 for ; Thu, 2 Jul 2020 12:50:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 949C434EF76 for ; Thu, 2 Jul 2020 12:50:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F66C2C6 for ; Thu, 2 Jul 2020 12:50:04 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1593694173.fe9d90fdbb4a0836fbfff32f596449337b484cd5.aballier@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.3.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: fe9d90fdbb4a0836fbfff32f596449337b484cd5 X-VCS-Branch: master Date: Thu, 2 Jul 2020 12:50:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d65b4c16-bc64-4431-a903-e170fbc2ab4d X-Archives-Hash: 4975ed5a259fd11eb2bd253aa3635357 commit: fe9d90fdbb4a0836fbfff32f596449337b484cd5 Author: Alexis Ballier gentoo org> AuthorDate: Thu Jun 18 15:12:21 2020 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Jul 2 12:49:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9d90fd media-video/ffmpeg: Move EXTRA_FFMPEG_CONF last to the configure call Otherwise we cant override ebuild-fed options. Closes: https://bugs.gentoo.org/711448 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Alexis Ballier gentoo.org> media-video/ffmpeg/ffmpeg-4.3.ebuild | 5 +++-- media-video/ffmpeg/ffmpeg-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.3.ebuild b/media-video/ffmpeg/ffmpeg-4.3.ebuild index 9c9b6d816ba..c0ff83aacf2 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.ebuild @@ -345,7 +345,7 @@ src_prepare() { } multilib_src_configure() { - local myconf=( ${EXTRA_FFMPEG_CONF} ) + local myconf=( ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) @@ -475,7 +475,8 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --optflags="${CFLAGS}" \ $(use_enable static-libs static) \ - "${myconf[@]}" + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 1492176f8a9..ab35ad930ee 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -344,7 +344,7 @@ src_prepare() { } multilib_src_configure() { - local myconf=( ${EXTRA_FFMPEG_CONF} ) + local myconf=( ) local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) @@ -474,7 +474,8 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --optflags="${CFLAGS}" \ $(use_enable static-libs static) \ - "${myconf[@]}" + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} echo "${@}" "${@}" || die