| 1 |
commit: fe9d90fdbb4a0836fbfff32f596449337b484cd5 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 18 15:12:21 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 2 12:49:33 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9d90fd |
| 7 |
|
| 8 |
media-video/ffmpeg: Move EXTRA_FFMPEG_CONF last to the configure call |
| 9 |
|
| 10 |
Otherwise we cant override ebuild-fed options. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/711448 |
| 13 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
| 14 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 15 |
|
| 16 |
media-video/ffmpeg/ffmpeg-4.3.ebuild | 5 +++-- |
| 17 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 5 +++-- |
| 18 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-video/ffmpeg/ffmpeg-4.3.ebuild b/media-video/ffmpeg/ffmpeg-4.3.ebuild |
| 21 |
index 9c9b6d816ba..c0ff83aacf2 100644 |
| 22 |
--- a/media-video/ffmpeg/ffmpeg-4.3.ebuild |
| 23 |
+++ b/media-video/ffmpeg/ffmpeg-4.3.ebuild |
| 24 |
@@ -345,7 +345,7 @@ src_prepare() { |
| 25 |
} |
| 26 |
|
| 27 |
multilib_src_configure() { |
| 28 |
- local myconf=( ${EXTRA_FFMPEG_CONF} ) |
| 29 |
+ local myconf=( ) |
| 30 |
|
| 31 |
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) |
| 32 |
use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) |
| 33 |
@@ -475,7 +475,8 @@ multilib_src_configure() { |
| 34 |
--ranlib="$(tc-getRANLIB)" \ |
| 35 |
--optflags="${CFLAGS}" \ |
| 36 |
$(use_enable static-libs static) \ |
| 37 |
- "${myconf[@]}" |
| 38 |
+ "${myconf[@]}" \ |
| 39 |
+ ${EXTRA_FFMPEG_CONF} |
| 40 |
echo "${@}" |
| 41 |
"${@}" || die |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 45 |
index 1492176f8a9..ab35ad930ee 100644 |
| 46 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 47 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 48 |
@@ -344,7 +344,7 @@ src_prepare() { |
| 49 |
} |
| 50 |
|
| 51 |
multilib_src_configure() { |
| 52 |
- local myconf=( ${EXTRA_FFMPEG_CONF} ) |
| 53 |
+ local myconf=( ) |
| 54 |
|
| 55 |
local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) |
| 56 |
use openssl || use libressl && use gpl && myconf+=( --enable-nonfree ) |
| 57 |
@@ -474,7 +474,8 @@ multilib_src_configure() { |
| 58 |
--ranlib="$(tc-getRANLIB)" \ |
| 59 |
--optflags="${CFLAGS}" \ |
| 60 |
$(use_enable static-libs static) \ |
| 61 |
- "${myconf[@]}" |
| 62 |
+ "${myconf[@]}" \ |
| 63 |
+ ${EXTRA_FFMPEG_CONF} |
| 64 |
echo "${@}" |
| 65 |
"${@}" || die |
Archives