| 1 |
commit: 3518f0153f27c0681fcb311ebc6a822380122e0c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 30 16:41:03 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 16:41:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3518f015 |
| 7 |
|
| 8 |
media-video/ffmpeg: Drop aacplus & vo-aacenc in live ebuild. |
| 9 |
|
| 10 |
Those have been dropped upstream. Internal encoder should be superior to vo-aacenc and fdk-aac should be superior to aacplus for AAC-HE |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 14 |
|
| 15 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 16 +++++----------- |
| 16 |
1 file changed, 5 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 19 |
index 94e2419..32720de 100644 |
| 20 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 21 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 22 |
@@ -47,10 +47,6 @@ LICENSE=" |
| 23 |
!gpl? ( LGPL-3 ) |
| 24 |
) |
| 25 |
encode? ( |
| 26 |
- aac? ( |
| 27 |
- gpl? ( GPL-3 ) |
| 28 |
- !gpl? ( LGPL-3 ) |
| 29 |
- ) |
| 30 |
amrenc? ( |
| 31 |
gpl? ( GPL-3 ) |
| 32 |
!gpl? ( LGPL-3 ) |
| 33 |
@@ -94,8 +90,8 @@ FFMPEG_FLAG_MAP=( |
| 34 |
|
| 35 |
# Same as above but for encoders, i.e. they do something only with USE=encode. |
| 36 |
FFMPEG_ENCODER_FLAG_MAP=( |
| 37 |
- aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame |
| 38 |
- aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc |
| 39 |
+ amrenc:libvo-amrwbenc mp3:libmp3lame |
| 40 |
+ faac:libfaac kvazaar:libkvazaar nvenc:nvenc |
| 41 |
openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame |
| 42 |
wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid |
| 43 |
) |
| 44 |
@@ -167,8 +163,6 @@ RDEPEND=" |
| 45 |
celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) |
| 46 |
chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) |
| 47 |
encode? ( |
| 48 |
- aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) |
| 49 |
- aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) |
| 50 |
amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) |
| 51 |
faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) |
| 52 |
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) |
| 53 |
@@ -293,7 +287,7 @@ REQUIRED_USE=" |
| 54 |
${GPL_REQUIRED_USE} |
| 55 |
${CPU_REQUIRED_USE}" |
| 56 |
RESTRICT=" |
| 57 |
- encode? ( faac? ( bindist ) aacplus? ( bindist ) nvenc? ( bindist ) ) |
| 58 |
+ encode? ( faac? ( bindist ) nvenc? ( bindist ) ) |
| 59 |
gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) |
| 60 |
" |
| 61 |
|
| 62 |
@@ -322,10 +316,10 @@ multilib_src_configure() { |
| 63 |
ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) |
| 64 |
|
| 65 |
# Licensing. |
| 66 |
- if use aac || use amrenc ; then |
| 67 |
+ if use amrenc ; then |
| 68 |
myconf+=( --enable-version3 ) |
| 69 |
fi |
| 70 |
- if use aacplus || use faac || use nvenc ; then |
| 71 |
+ if use faac || use nvenc ; then |
| 72 |
myconf+=( --enable-nonfree ) |
| 73 |
fi |
| 74 |
else |
Archives