summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-10-03 10:29:18 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-10-03 10:51:20 +0200
commit318f86f781b2ab420746c1d6f94ad5a23361be9d (patch)
treedd7bf545832c6a3a01f2d49477f414f6f74884fb /media-video
parentsys-libs/libcxx: version bump to 3.9.0 (diff)
downloadgentoo-318f86f781b2ab420746c1d6f94ad5a23361be9d.tar.gz
gentoo-318f86f781b2ab420746c1d6f94ad5a23361be9d.tar.bz2
gentoo-318f86f781b2ab420746c1d6f94ad5a23361be9d.zip
media-video/ffmpeg: remove faac (dropped upstream)
Package-Manager: portage-2.3.1
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild7
1 files changed, 1 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 603f9b863f4b..66114d3b19c2 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