1 |
commit: 04801267a8008f61c44cb50a1d4af0b64aac75e0 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 11 09:46:52 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 26 08:51:22 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04801267 |
7 |
|
8 |
virtual/ffmpeg: Drop multilib flags. Those are not needed for executables and packages usedeping on the flags here likely should be converted to USE=libav |
9 |
|
10 |
Package-Manager: Portage-2.3.4, Repoman-2.3.2 |
11 |
|
12 |
virtual/ffmpeg/ffmpeg-9-r2.ebuild | 6 ++---- |
13 |
1 file changed, 2 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild |
16 |
index 23f3412012d..f9b41e7f78b 100644 |
17 |
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild |
18 |
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild |
19 |
@@ -3,8 +3,6 @@ |
20 |
|
21 |
EAPI=5 |
22 |
|
23 |
-inherit multilib-build |
24 |
- |
25 |
DESCRIPTION="Virtual package for FFmpeg executable implementation" |
26 |
|
27 |
# Please note that this virtual is only suited for packages that call |
28 |
@@ -19,6 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd |
29 |
IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264" |
30 |
|
31 |
RDEPEND=" |
32 |
- libav? ( >=media-video/libav-9.12[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) |
33 |
- !libav? ( >=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) |
34 |
+ libav? ( >=media-video/libav-9.12[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) |
35 |
+ !libav? ( >=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) |
36 |
" |