1 |
commit: 318f86f781b2ab420746c1d6f94ad5a23361be9d |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 3 08:29:18 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 3 08:51:20 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318f86f7 |
7 |
|
8 |
media-video/ffmpeg: remove faac (dropped upstream) |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 7 +------ |
13 |
1 file changed, 1 insertion(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
16 |
index 603f9b8..66114d3 100644 |
17 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
18 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
19 |
@@ -91,7 +91,7 @@ FFMPEG_FLAG_MAP=( |
20 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
21 |
FFMPEG_ENCODER_FLAG_MAP=( |
22 |
amrenc:libvo-amrwbenc mp3:libmp3lame |
23 |
- faac:libfaac kvazaar:libkvazaar nvenc:nvenc |
24 |
+ kvazaar:libkvazaar nvenc:nvenc |
25 |
openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame |
26 |
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid |
27 |
) |
28 |
@@ -165,7 +165,6 @@ RDEPEND=" |
29 |
ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] ) |
30 |
encode? ( |
31 |
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) |
32 |
- faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) |
33 |
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) |
34 |
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) |
35 |
nvenc? ( media-video/nvidia_video_sdk ) |
36 |
@@ -280,7 +279,6 @@ REQUIRED_USE=" |
37 |
${GPL_REQUIRED_USE} |
38 |
${CPU_REQUIRED_USE}" |
39 |
RESTRICT=" |
40 |
- encode? ( faac? ( bindist ) ) |
41 |
gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) |
42 |
" |
43 |
|
44 |
@@ -312,9 +310,6 @@ multilib_src_configure() { |
45 |
if use amrenc ; then |
46 |
myconf+=( --enable-version3 ) |
47 |
fi |
48 |
- if use faac ; then |
49 |
- myconf+=( --enable-nonfree ) |
50 |
- fi |
51 |
else |
52 |
myconf+=( --disable-encoders ) |
53 |
fi |