Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
Date: Thu, 17 Jan 2019 02:47:40
Message-Id: 1547693242.0cc6977833961d39dd68ef2040878d26ec441615.asturm@gentoo
1 commit: 0cc6977833961d39dd68ef2040878d26ec441615
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 17 02:41:26 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 17 02:47:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc69778
7
8 media-video/x264-encoder: Switch virtual/ffmpeg -> USE ffmpeg/libav
9
10 Package-Manager: Portage-2.3.56, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-video/x264-encoder/x264-encoder-9999.ebuild | 7 +++++--
14 1 file changed, 5 insertions(+), 2 deletions(-)
15
16 diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
17 index 8c3b410528a..3a0cdc8541f 100644
18 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild
19 +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
20 @@ -21,13 +21,16 @@ fi
21
22 LICENSE="GPL-2"
23 SLOT="0"
24 -IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
25 +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
26
27 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
28
29 RDEPEND="
30 ~media-libs/x264-${PV}[interlaced=,threads=]
31 - ffmpeg? ( virtual/ffmpeg )
32 + ffmpeg? (
33 + !libav? ( media-video/ffmpeg:= )
34 + libav? ( media-video/libav:= )
35 + )
36 ffmpegsource? ( media-libs/ffmpegsource )
37 mp4? ( >=media-video/gpac-0.5.2:= )"