diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-06-18 17:12:21 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-07-02 14:49:33 +0200 |
| commit | fe9d90fdbb4a0836fbfff32f596449337b484cd5 (patch) | |
| tree | 6941103d4c8699377642fc5318ccfde61878b26e /media-video/ffmpeg | |
| parent | media-video/ffmpeg: Enable gnutls by default. (diff) | |
| download | gentoo-fe9d90fdbb4a0836fbfff32f596449337b484cd5.tar.gz gentoo-fe9d90fdbb4a0836fbfff32f596449337b484cd5.tar.bz2 gentoo-fe9d90fdbb4a0836fbfff32f596449337b484cd5.zip | |
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 <aballier@gentoo.org>
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-4.3.ebuild | 5 | ||||
| -rw-r--r-- | 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 9c9b6d816bad..c0ff83aacf25 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 1492176f8a9b..ab35ad930eee 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 |