From: Andreas Sturmlechner Date: Thu, 17 Jan 2019 02:41:26 +0000 (+0100) Subject: media-video/x264-encoder: Switch virtual/ffmpeg -> USE ffmpeg/libav X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0cc6977833961d39dd68ef2040878d26ec441615;p=gentoo.git media-video/x264-encoder: Switch virtual/ffmpeg -> USE ffmpeg/libav Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index 8c3b410528ac..3a0cdc8541fa 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -21,13 +21,16 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND=" ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )"