From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A55B1382C5 for ; Sun, 25 Feb 2018 19:42:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BACCE07EA; Sun, 25 Feb 2018 19:42:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 57218E07D9 for ; Sun, 25 Feb 2018 19:42:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D465335C43 for ; Sun, 25 Feb 2018 19:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B747F233 for ; Sun, 25 Feb 2018 19:41:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1519587704.0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild media-video/x264-encoder/x264-encoder-9999.ebuild X-VCS-Directories: media-video/x264-encoder/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8 X-VCS-Branch: master Date: Sun, 25 Feb 2018 19:41:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fc48f22c-fd86-4dfe-b165-9263fceb5af8 X-Archives-Hash: 3f4a7200e59877a919bacc4e26fbb01f commit: 0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 25 19:30:03 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 25 19:41:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7fbcdb media-video/x264-encoder: EAPI 6, git-r3, https Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../x264-encoder/x264-encoder-0.0.20170701.ebuild | 19 +++++++++---------- media-video/x264-encoder/x264-encoder-9999.ebuild | 19 +++++++++---------- 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 96667a601b4..4958c30688e 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 96667a601b4..4958c30688e 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