From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C0F4F58973 for ; Sat, 30 Jan 2016 16:41:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5962AE0875; Sat, 30 Jan 2016 16:41:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05428E0875 for ; Sat, 30 Jan 2016 16:41:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42534340B3D for ; Sat, 30 Jan 2016 16:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B5DF8F4 for ; Sat, 30 Jan 2016 16:41:32 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1454172085.3518f0153f27c0681fcb311ebc6a822380122e0c.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 3518f0153f27c0681fcb311ebc6a822380122e0c X-VCS-Branch: master Date: Sat, 30 Jan 2016 16:41:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d11d8cba-58cc-45a8-bccf-ffd39d53069c X-Archives-Hash: 951bcc1efd7aaf270d8a634e62360ff8 commit: 3518f0153f27c0681fcb311ebc6a822380122e0c Author: Alexis Ballier gentoo org> AuthorDate: Sat Jan 30 16:41:03 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Sat Jan 30 16:41:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3518f015 media-video/ffmpeg: Drop aacplus & vo-aacenc in live ebuild. Those have been dropped upstream. Internal encoder should be superior to vo-aacenc and fdk-aac should be superior to aacplus for AAC-HE Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier gentoo.org> media-video/ffmpeg/ffmpeg-9999.ebuild | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 94e2419..32720de 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -47,10 +47,6 @@ LICENSE=" !gpl? ( LGPL-3 ) ) encode? ( - aac? ( - gpl? ( GPL-3 ) - !gpl? ( LGPL-3 ) - ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) @@ -94,8 +90,8 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( - aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame - aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc + amrenc:libvo-amrwbenc mp3:libmp3lame + faac:libfaac kvazaar:libkvazaar nvenc:nvenc openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid ) @@ -167,8 +163,6 @@ RDEPEND=" celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) encode? ( - aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) - aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] ) @@ -293,7 +287,7 @@ REQUIRED_USE=" ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" RESTRICT=" - encode? ( faac? ( bindist ) aacplus? ( bindist ) nvenc? ( bindist ) ) + encode? ( faac? ( bindist ) nvenc? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) " @@ -322,10 +316,10 @@ multilib_src_configure() { ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) # Licensing. - if use aac || use amrenc ; then + if use amrenc ; then myconf+=( --enable-version3 ) fi - if use aacplus || use faac || use nvenc ; then + if use faac || use nvenc ; then myconf+=( --enable-nonfree ) fi else