From a2acd65de316841c480baba672aee6b98df02d7e Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sat, 25 Apr 2020 22:14:08 +0300 Subject: [PATCH] media-video/x264-encoder: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada --- .../x264-encoder/x264-encoder-0.0.20190214.ebuild | 9 +++------ .../x264-encoder/x264-encoder-0.0.20190903.ebuild | 9 +++------ media-video/x264-encoder/x264-encoder-9999.ebuild | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild index a597d419a813..893ddce8fed1 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,16 +20,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND=" ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )" diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild index 6ad1f8d7a6c7..18dccd367cb0 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,16 +20,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND=" ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )" diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index 6ad1f8d7a6c7..18dccd367cb0 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,16 +20,13 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND=" ~media-libs/x264-${PV}[interlaced=,threads=] - ffmpeg? ( - !libav? ( media-video/ffmpeg:= ) - libav? ( media-video/libav:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )" -- 2.26.2