From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Mar 2018 15:59:12 +0000 Subject: gentoo resync : 02.03.2018 --- media-video/x264-encoder/Manifest | 4 ++-- .../x264-encoder/x264-encoder-0.0.20170701.ebuild | 21 ++++++++++----------- media-video/x264-encoder/x264-encoder-9999.ebuild | 19 +++++++++---------- 3 files changed, 21 insertions(+), 23 deletions(-) (limited to 'media-video/x264-encoder') diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index fa79b1ce40d5..1b73400bdf15 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -2,6 +2,6 @@ AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a4 DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f EBUILD x264-encoder-0.0.20160712.ebuild 2172 BLAKE2B 296b52516b478729d9f87f0a1c50393d74e1b11f38fa445838a219940388a63de4d2ef63cb91f34bf1e422afb67d02de1864bf4ef3534cea4dc15a1f07c368a6 SHA512 94d003d2096750d5b333315a805858b403c09c0bb20f271cfcdeb1bd3d035b7353611c76c9c475ee3675762cc178c2e4db8eaa2ca92ca10477a36c5446582a33 -EBUILD x264-encoder-0.0.20170701.ebuild 2175 BLAKE2B 30fe4fa438f4a77309475ba25ab536c566890c4db4688b18feabdf4c64def3baa55df564cc3e5b7ea0f928986488a3a992faf9c27c9eccf96cd1b1ef5ab8b624 SHA512 1929a387d51bd0ea89b333f5dcce3d23accce43835710f4837fcfe61303475ae47d0e08559e7f51bb40f721b1efe95b7eb9a8df375ebba3409d92beeee025557 -EBUILD x264-encoder-9999.ebuild 2175 BLAKE2B 30fe4fa438f4a77309475ba25ab536c566890c4db4688b18feabdf4c64def3baa55df564cc3e5b7ea0f928986488a3a992faf9c27c9eccf96cd1b1ef5ab8b624 SHA512 1929a387d51bd0ea89b333f5dcce3d23accce43835710f4837fcfe61303475ae47d0e08559e7f51bb40f721b1efe95b7eb9a8df375ebba3409d92beeee025557 +EBUILD x264-encoder-0.0.20170701.ebuild 2153 BLAKE2B f02d87b81eed8ff4778bc31e36b7309aeb0bc82819c77dfcb4a02268fd3758cdb18eddd4338099074c9eccd11bf6cf925fc6e524202bf8977677f6eb8b5cb958 SHA512 214e20a611544cebf87b7a4b5d01688f4926d6d9d2685b37e6a0ddea9d419e2a0ed5cec51c0e3c3b9cfbab39e8ec5252b451f9bb3d26facc19c7f03cdf7c144c +EBUILD x264-encoder-9999.ebuild 2155 BLAKE2B 4a1ac4e8a49544996c39952a84f91cafa363d1dccc4b500af3b6419a5e9dc9fe27dfd29f259337949bd2a6eb16d723eff3f8a70ca07b95ca90cabf07c4e81026 SHA512 684327257e53797928802134cb1bac95266667a7999b3ad1b9edd1a0dab525d69ecec743924625522c91202c89c6b386d53375af55999a817090e8ef46d803c2 MISC metadata.xml 587 BLAKE2B c768f1adecd9c56480a7ae1c3c4907230d5e1ffd7884abdf569de00f64bc34faf6314e473928540d6c9fa747bfaf2573717b2fdca0996a80f69ea7330c3c6226 SHA512 383e8540e2bde9190f48030956ff00eebb86f02781dfeffee9507198e00ee9d7f6cba6e05e5b9c7e8c692b0d5935531c162d7b5efe61a7f1ce2a88458ae2ec04 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..56e61327598f 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild @@ -1,21 +1,21 @@ -# 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 MY_P="x264-snapshot-$(get_version_component_range 3)-2245" SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" S="${WORKDIR}/${MY_P}" fi @@ -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 -- cgit v1.2.3