From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4BE9138330 for ; Mon, 3 Oct 2016 08:51:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55440E0B7A; Mon, 3 Oct 2016 08:51:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3911FE0B7A for ; Mon, 3 Oct 2016 08:51:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9970340E1E for ; Mon, 3 Oct 2016 08:51:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D908724A8 for ; Mon, 3 Oct 2016 08:51:26 +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: <1475484680.318f86f781b2ab420746c1d6f94ad5a23361be9d.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: 318f86f781b2ab420746c1d6f94ad5a23361be9d X-VCS-Branch: master Date: Mon, 3 Oct 2016 08:51:26 +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: ad35ca62-8b2d-4833-ba31-5bae83465eca X-Archives-Hash: b1d75baaddbb025a91ac0d58e957ef7e commit: 318f86f781b2ab420746c1d6f94ad5a23361be9d Author: Alexis Ballier gentoo org> AuthorDate: Mon Oct 3 08:29:18 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Mon Oct 3 08:51:20 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318f86f7 media-video/ffmpeg: remove faac (dropped upstream) Package-Manager: portage-2.3.1 media-video/ffmpeg/ffmpeg-9999.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 603f9b8..66114d3 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -91,7 +91,7 @@ FFMPEG_FLAG_MAP=( # Same as above but for encoders, i.e. they do something only with USE=encode. FFMPEG_ENCODER_FLAG_MAP=( amrenc:libvo-amrwbenc mp3:libmp3lame - faac:libfaac kvazaar:libkvazaar nvenc:nvenc + kvazaar:libkvazaar nvenc:nvenc openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid ) @@ -165,7 +165,6 @@ RDEPEND=" ebur128? ( >=media-libs/libebur128-1.1.0[${MULTILIB_USEDEP}] ) encode? ( 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}] ) mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) nvenc? ( media-video/nvidia_video_sdk ) @@ -280,7 +279,6 @@ REQUIRED_USE=" ${GPL_REQUIRED_USE} ${CPU_REQUIRED_USE}" RESTRICT=" - encode? ( faac? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) " @@ -312,9 +310,6 @@ multilib_src_configure() { if use amrenc ; then myconf+=( --enable-version3 ) fi - if use faac ; then - myconf+=( --enable-nonfree ) - fi else myconf+=( --disable-encoders ) fi