diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-22 10:09:44 +0000 |
| commit | 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch) | |
| tree | 41a96399f56ed3aa399006871bfce4430db84aa2 /media-video/x264-encoder | |
| parent | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff) | |
gentoo resync : 22.01.2019
Diffstat (limited to 'media-video/x264-encoder')
| -rw-r--r-- | media-video/x264-encoder/Manifest | 2 | ||||
| -rw-r--r-- | media-video/x264-encoder/x264-encoder-9999.ebuild | 21 |
2 files changed, 12 insertions, 11 deletions
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index 43dac5fb29ad..228a02a4ebe1 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -1,5 +1,5 @@ AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f EBUILD x264-encoder-0.0.20170701.ebuild 2153 BLAKE2B f02d87b81eed8ff4778bc31e36b7309aeb0bc82819c77dfcb4a02268fd3758cdb18eddd4338099074c9eccd11bf6cf925fc6e524202bf8977677f6eb8b5cb958 SHA512 214e20a611544cebf87b7a4b5d01688f4926d6d9d2685b37e6a0ddea9d419e2a0ed5cec51c0e3c3b9cfbab39e8ec5252b451f9bb3d26facc19c7f03cdf7c144c -EBUILD x264-encoder-9999.ebuild 2155 BLAKE2B 4a1ac4e8a49544996c39952a84f91cafa363d1dccc4b500af3b6419a5e9dc9fe27dfd29f259337949bd2a6eb16d723eff3f8a70ca07b95ca90cabf07c4e81026 SHA512 684327257e53797928802134cb1bac95266667a7999b3ad1b9edd1a0dab525d69ecec743924625522c91202c89c6b386d53375af55999a817090e8ef46d803c2 +EBUILD x264-encoder-9999.ebuild 2129 BLAKE2B b3f83ed8c5bb1b9df53d59329d9b8b711e045374183acfb23113ae4817371c1390d894caa940b838c2e1e2c2b2ea2319a8ebf4c5ec8f65661113e647d2888e30 SHA512 75425b85162966277993d7df3edcb0a4f159c519596c51e236fc6941d790ebc712781494f5f8eb65c41c7e38ce57f162ac81dd25b3b48812157d3b6472639581 MISC metadata.xml 587 BLAKE2B c768f1adecd9c56480a7ae1c3c4907230d5e1ffd7884abdf569de00f64bc34faf6314e473928540d6c9fa747bfaf2573717b2fdca0996a80f69ea7330c3c6226 SHA512 383e8540e2bde9190f48030956ff00eebb86f02781dfeffee9507198e00ee9d7f6cba6e05e5b9c7e8c692b0d5935531c162d7b5efe61a7f1ce2a88458ae2ec04 diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index 4958c30688e0..ae007c71112c 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs @@ -12,8 +12,7 @@ if [[ ${PV} == 9999 ]]; then 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" + MY_P="x264-snapshot-$(ver_cut 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" S="${WORKDIR}/${MY_P}" @@ -21,13 +20,16 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND=" - ~media-libs/x264-${PV}[10bit=,interlaced=,threads=] - ffmpeg? ( virtual/ffmpeg ) + ~media-libs/x264-${PV}[interlaced=,threads=] + ffmpeg? ( + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.5.2:= )" @@ -35,8 +37,8 @@ ASM_DEP=">=dev-lang/nasm-2.13" DEPEND="${RDEPEND} amd64? ( ${ASM_DEP} ) x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} ) - virtual/pkgconfig" + x86-fbsd? ( ${ASM_DEP} )" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/gpac.patch" ) @@ -52,7 +54,6 @@ src_configure() { --system-libx264 \ --host="${CHOST}" \ --disable-lsmash \ - $(usex 10bit "--bit-depth=10" "") \ $(usex avs "" "--disable-avs") \ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ $(usex ffmpegsource "" "--disable-ffms") \ |