summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-02-25 20:30:03 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-02-25 20:41:44 +0100
commit0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8 (patch)
treec3fe778b51c5a5e1f0b8f284bb724d98182830b0 /media-video
parentmedia-fonts/clearsans: EAPI 6 (diff)
downloadgentoo-0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8.tar.gz
gentoo-0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8.tar.bz2
gentoo-0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8.zip
media-video/x264-encoder: EAPI 6, git-r3, https
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'media-video')
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild19
-rw-r--r--media-video/x264-encoder/x264-encoder-9999.ebuild19
2 files changed, 18 insertions, 20 deletions
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 96667a601b46..4958c30688e0 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit flag-o-matic multilib toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
SRC_URI=""
else
inherit versionator
@@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
+RDEPEND="
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
@@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
+PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 96667a601b46..4958c30688e0 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit flag-o-matic multilib toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
SRC_URI=""
else
inherit versionator
@@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
+RDEPEND="
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
@@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
+PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC