commit: a2acd65de316841c480baba672aee6b98df02d7e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 19:14:08 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 19:14:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2acd65d
media-video/x264-encoder: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 9 +++------
media-video/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 a597d419a81..893ddce8fed 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 6ad1f8d7a6c..18dccd367cb 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 6ad1f8d7a6c..18dccd367cb 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:= )"
