summaryrefslogtreecommitdiff
path: root/media-libs/x264
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-02 15:59:12 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-02 15:59:12 +0000
commit06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree8d58c1f4b049da677b33209b072f2b3057268fe0 /media-libs/x264
parent99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)
gentoo resync : 02.03.2018
Diffstat (limited to 'media-libs/x264')
-rw-r--r--media-libs/x264/Manifest4
-rw-r--r--media-libs/x264/x264-0.0.20170701.ebuild16
-rw-r--r--media-libs/x264/x264-9999.ebuild12
3 files changed, 14 insertions, 18 deletions
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 11b185e53098..dad5efa29bcc 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,6 @@
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-0.0.20160712.ebuild 1996 BLAKE2B 57431a358195c6c3a061603ceef6dac39c5e74f1ce6c71505a4e670a6f4ca1daa2a43234184d4721cc03142a86d462616fd43f5ba9d4aa7340c5a01767749d6f SHA512 086681d299da2130bd4362d20af2d7085297616a28b8b12bf540bb60bd8032dc934597d39437b5c12805d6e48bef6c6afc2cefd569291325ef597ae6c11d2599
-EBUILD x264-0.0.20170701.ebuild 2003 BLAKE2B 07976a462e0128748cf1c18a42648c20594d8f37c52b10c7e4cceb5d285f3ddd31644e99edeffd4a177e3134a31369a88264c4fd871b4c9e723a2bbfff324de9 SHA512 05a0417fb34191837d8c53bbd30b2b5bd15051dd92239353e26d44f8eab3c6eca983e7abda2c3eb5c48da1099b2fddfb1ea0b7d1b6db973887843fa75a9f38a6
-EBUILD x264-9999.ebuild 1965 BLAKE2B 0551d90deae6abacf233078dcc5e6af906082c56e3a89aeb6e527a7919e6c2b26eb49a8e829d0c714da0a3acb1ecc71a715ba33e169fa4779a0ec339f73e18aa SHA512 ff37d489381464896c79df08d2fa0103b375d3931fbca545cbaef090a0be9fdc63d484a00be00e44cb04e4bf2bd3ddb1413de592bfca5ffe80e05c9030d9e902
+EBUILD x264-0.0.20170701.ebuild 1912 BLAKE2B ae545331a0b0f7bf451c4890a55ea82b017c654c4e9f26c891be3f653928befdade365e91a5b200b5ce65c9ad050c99d77a4c2d2d0b6807cf0a1afc99e66e225 SHA512 da229f0c8bc4268dd9e06789cb3143134afcf5ed0e012119c5efd04a9f19755295c6ebae8537cda15c8084fcae26e395ca42fb711e986c47a7558c9faebe596b
+EBUILD x264-9999.ebuild 1872 BLAKE2B 11fd5c709aff1160cb47eeff901e5e767a62b78ae099dfd7004a88ad2f8409d0fa239cf838fcdd0c6c971cae08a9f1911602c43caf3fdffc715c0f86dfbcb915 SHA512 b45280bc7602ff5787f337a63e121356ac1f659209eeea8e9247fa17d540a7eadbe85ba67865340921e059d627749445bd93e3ed609fa87579628bdd2265aefe
MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-0.0.20170701.ebuild b/media-libs/x264/x264-0.0.20170701.ebuild
index 5b43cae05d1a..4ad0022af19a 100644
--- a/media-libs/x264/x264-0.0.20170701.ebuild
+++ b/media-libs/x264/x264-0.0.20170701.ebuild
@@ -1,20 +1,20 @@
# 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 multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="https://git.videolan.org/x264.git"
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${MY_P}"
fi
@@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="abi_x86_32? ( ${ASM_DEP} )
abi_x86_64? ( ${ASM_DEP} )
opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-DOCS="AUTHORS doc/*.txt"
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
multilib_src_configure() {
tc-export CC
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 388a9eef9f25..be9802ee557e 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 multilib-minimal
+inherit flag-o-matic multilib-minimal toolchain-funcs
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
@@ -28,11 +28,9 @@ ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="abi_x86_32? ( ${ASM_DEP} )
abi_x86_64? ( ${ASM_DEP} )
opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
-DOCS="AUTHORS doc/*.txt"
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
multilib_src_configure() {
tc-export CC