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: Sun, 25 Feb 2018 19:42:04
Message-Id: 1519587704.0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8.asturm@gentoo
1 commit: 0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 25 19:30:03 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 25 19:41:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7fbcdb
7
8 media-video/x264-encoder: EAPI 6, git-r3, https
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 .../x264-encoder/x264-encoder-0.0.20170701.ebuild | 19 +++++++++----------
13 media-video/x264-encoder/x264-encoder-9999.ebuild | 19 +++++++++----------
14 2 files changed, 18 insertions(+), 20 deletions(-)
15
16 diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
17 index 96667a601b4..4958c30688e 100644
18 --- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
19 +++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
20 @@ -1,15 +1,15 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=5
26 +EAPI=6
27
28 -inherit flag-o-matic multilib toolchain-funcs eutils
29 +inherit flag-o-matic toolchain-funcs
30
31 DESCRIPTION="A free commandline encoder for X264/AVC streams"
32 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
33 +HOMEPAGE="https://www.videolan.org/developers/x264.html"
34 if [[ ${PV} == 9999 ]]; then
35 - inherit git-2
36 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
37 + inherit git-r3
38 + EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
39 SRC_URI=""
40 else
41 inherit versionator
42 @@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
43
44 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
45
46 -RDEPEND="ffmpeg? ( virtual/ffmpeg )
47 +RDEPEND="
48 ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
49 + ffmpeg? ( virtual/ffmpeg )
50 ffmpegsource? ( media-libs/ffmpegsource )
51 mp4? ( >=media-video/gpac-0.5.2:= )"
52
53 @@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
54 x86-fbsd? ( ${ASM_DEP} )
55 virtual/pkgconfig"
56
57 -src_prepare() {
58 - epatch "${FILESDIR}/gpac.patch"
59 -}
60 +PATCHES=( "${FILESDIR}/gpac.patch" )
61
62 src_configure() {
63 tc-export CC
64
65 diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
66 index 96667a601b4..4958c30688e 100644
67 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild
68 +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
69 @@ -1,15 +1,15 @@
70 -# Copyright 1999-2017 Gentoo Foundation
71 +# Copyright 1999-2018 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73
74 -EAPI=5
75 +EAPI=6
76
77 -inherit flag-o-matic multilib toolchain-funcs eutils
78 +inherit flag-o-matic toolchain-funcs
79
80 DESCRIPTION="A free commandline encoder for X264/AVC streams"
81 -HOMEPAGE="http://www.videolan.org/developers/x264.html"
82 +HOMEPAGE="https://www.videolan.org/developers/x264.html"
83 if [[ ${PV} == 9999 ]]; then
84 - inherit git-2
85 - EGIT_REPO_URI="git://git.videolan.org/x264.git"
86 + inherit git-r3
87 + EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
88 SRC_URI=""
89 else
90 inherit versionator
91 @@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
92
93 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
94
95 -RDEPEND="ffmpeg? ( virtual/ffmpeg )
96 +RDEPEND="
97 ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
98 + ffmpeg? ( virtual/ffmpeg )
99 ffmpegsource? ( media-libs/ffmpegsource )
100 mp4? ( >=media-video/gpac-0.5.2:= )"
101
102 @@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
103 x86-fbsd? ( ${ASM_DEP} )
104 virtual/pkgconfig"
105
106 -src_prepare() {
107 - epatch "${FILESDIR}/gpac.patch"
108 -}
109 +PATCHES=( "${FILESDIR}/gpac.patch" )
110
111 src_configure() {
112 tc-export CC