1 |
commit: a2acd65de316841c480baba672aee6b98df02d7e |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 25 19:14:08 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 25 19:14:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2acd65d |
7 |
|
8 |
media-video/x264-encoder: migrate from libav |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 9 +++------ |
14 |
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 9 +++------ |
15 |
media-video/x264-encoder/x264-encoder-9999.ebuild | 9 +++------ |
16 |
3 files changed, 9 insertions(+), 18 deletions(-) |
17 |
|
18 |
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
19 |
index a597d419a81..893ddce8fed 100644 |
20 |
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
21 |
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2019 Gentoo Authors |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
@@ -20,16 +20,13 @@ fi |
29 |
|
30 |
LICENSE="GPL-2" |
31 |
SLOT="0" |
32 |
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" |
33 |
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" |
34 |
|
35 |
REQUIRED_USE="ffmpegsource? ( ffmpeg )" |
36 |
|
37 |
RDEPEND=" |
38 |
~media-libs/x264-${PV}[interlaced=,threads=] |
39 |
- ffmpeg? ( |
40 |
- !libav? ( media-video/ffmpeg:= ) |
41 |
- libav? ( media-video/libav:= ) |
42 |
- ) |
43 |
+ ffmpeg? ( media-video/ffmpeg:= ) |
44 |
ffmpegsource? ( media-libs/ffmpegsource ) |
45 |
mp4? ( >=media-video/gpac-0.5.2:= )" |
46 |
|
47 |
|
48 |
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
49 |
index 6ad1f8d7a6c..18dccd367cb 100644 |
50 |
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
51 |
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild |
52 |
@@ -1,4 +1,4 @@ |
53 |
-# Copyright 1999-2019 Gentoo Authors |
54 |
+# Copyright 1999-2020 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
EAPI=7 |
58 |
@@ -20,16 +20,13 @@ fi |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" |
63 |
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" |
64 |
|
65 |
REQUIRED_USE="ffmpegsource? ( ffmpeg )" |
66 |
|
67 |
RDEPEND=" |
68 |
~media-libs/x264-${PV}[interlaced=,threads=] |
69 |
- ffmpeg? ( |
70 |
- !libav? ( media-video/ffmpeg:= ) |
71 |
- libav? ( media-video/libav:= ) |
72 |
- ) |
73 |
+ ffmpeg? ( media-video/ffmpeg:= ) |
74 |
ffmpegsource? ( media-libs/ffmpegsource ) |
75 |
mp4? ( >=media-video/gpac-0.5.2:= )" |
76 |
|
77 |
|
78 |
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild |
79 |
index 6ad1f8d7a6c..18dccd367cb 100644 |
80 |
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild |
81 |
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild |
82 |
@@ -1,4 +1,4 @@ |
83 |
-# Copyright 1999-2019 Gentoo Authors |
84 |
+# Copyright 1999-2020 Gentoo Authors |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
|
87 |
EAPI=7 |
88 |
@@ -20,16 +20,13 @@ fi |
89 |
|
90 |
LICENSE="GPL-2" |
91 |
SLOT="0" |
92 |
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" |
93 |
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" |
94 |
|
95 |
REQUIRED_USE="ffmpegsource? ( ffmpeg )" |
96 |
|
97 |
RDEPEND=" |
98 |
~media-libs/x264-${PV}[interlaced=,threads=] |
99 |
- ffmpeg? ( |
100 |
- !libav? ( media-video/ffmpeg:= ) |
101 |
- libav? ( media-video/libav:= ) |
102 |
- ) |
103 |
+ ffmpeg? ( media-video/ffmpeg:= ) |
104 |
ffmpegsource? ( media-libs/ffmpegsource ) |
105 |
mp4? ( >=media-video/gpac-0.5.2:= )" |