summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-03-09 10:19:49 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-03-09 10:19:49 +0000
commit6ff48fd7a4a9084225ecea8970925642fa5c563b (patch)
tree61e9a4a6147b4862f537b61559f66c914edcc1b0 /media-video/x264-encoder
parentbump, includes support for SAT>IP devices (diff)
downloadhistorical-6ff48fd7a4a9084225ecea8970925642fa5c563b.tar.gz
historical-6ff48fd7a4a9084225ecea8970925642fa5c563b.tar.bz2
historical-6ff48fd7a4a9084225ecea8970925642fa5c563b.zip
disable lsmash to avoid automagic for now
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video/x264-encoder')
-rw-r--r--media-video/x264-encoder/ChangeLog7
-rw-r--r--media-video/x264-encoder/Manifest14
-rw-r--r--media-video/x264-encoder/x264-encoder-9999.ebuild5
3 files changed, 20 insertions, 6 deletions
diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index e5c03396ade4..188672a73b59 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/x264-encoder
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.74 2013/09/13 13:03:25 lu_zero Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.75 2014/03/09 10:19:46 aballier Exp $
+
+ 09 Mar 2014; Alexis Ballier <aballier@gentoo.org> x264-encoder-9999.ebuild:
+ disable lsmash to avoid automagic for now
*x264-encoder-0.0.20130912 (13 Sep 2013)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index b3e2c41c9f9a..32d85d0533e8 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX x264-encoder-nolib-20110425.patch 1547 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88 SHA512 48f845c5665a3ba8c77653260d017e89a58eee75693fe2c532ce1eea4e4ea1f4420c0126a63843f27fddb37bd76a529cb0a89a421a9d65f7cfc7226e49a579f1 WHIRLPOOL d8cf79801c47361a7cd689f569843df930628b5fd281c00a5b3b20d46c6a869853d2382d52dd5332a742f31f38cce190b1cfc27ef05c3b71d5b84b3456a5eff9
AUX x264-encoder-nostrip.patch 433 SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa SHA512 4103c43f54aebc814f4c5aecac0f115ff9f25fef352ce5945b37eb9d7a191fc21c1f608f81b6fb3d534a0a72b8bc4e49c6ed7e1e0d86fe39d18ad4d55241d6dd WHIRLPOOL ae648a2a61d2fcd3c35f5fe16b110249b7acbe2b2bac497b980c557bb3e95f8975296361f7482b5419ca88a1cf25258da60be53805feb6fa426b865dcd0ff4e3
DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
@@ -12,6 +15,13 @@ EBUILD x264-encoder-0.0.20120707.ebuild 2492 SHA256 c1a62164135d3415c75b421d5e83
EBUILD x264-encoder-0.0.20130506.ebuild 2240 SHA256 545b6e250462a20e5510b5352ccfcd7ba96e85556c198752448361b021d89afa SHA512 1954866c4b489f694dc3ebde4e1559b725c59171226d0a023f2e3df981600fb05db2292fe19c7f2c9b3bc133847f74fb1e209a9273efd600444c395b8296acf2 WHIRLPOOL 011427a06e0900e026dfb36be0f16447aaaa724c85d4e819aea0365d85576e8aecb5d3c3e0d650bd8f30c112c05e80f666fdc373be2fb896bf1598b0b7e06bce
EBUILD x264-encoder-0.0.20130731.ebuild 2240 SHA256 72620469fe21799a196b7b7d68cbb30077d8ac8b9c1a05b4426294285f2f6c88 SHA512 a0308923e3de76d2e14cd736981832f1681ae7583861d8957c524fee17c4181492fcd903d3a73920a188756d928ba2b62ab1cebe4442c8e4c49e620e197737d2 WHIRLPOOL f73c9aad3b833e55b14a6a3703722440476386ac45266ff2a111beb86aad564465247f8a962b1050af8e61a0eeddc0661a66b146f031f96c44c2b03050910271
EBUILD x264-encoder-0.0.20130912.ebuild 2239 SHA256 46f2e264c0437a662b1ca1b56873a0362a0a405f488538b01c3961301c25465b SHA512 00ba4fd751c6f50735ca16391fa2a9a7521b6f7484e12736941c7d81b66d3d2ac9e6af13a7487c86c5ed34e4d88c1d6dd93369f0abe6a7335a253b0984336e9c WHIRLPOOL 366086c4f072b8a1b7022b92fa1103a629ded7fa6f42bf3a04d2b9293b89839d276d862f1f9acb420bf2c8762f63e35a2606633fe6c866063234b5e0bca4b155
-EBUILD x264-encoder-9999.ebuild 2232 SHA256 be4972a26990c9b283976a97cb2e7e25e33303a96eb181f4430ccb9b91c0a6bf SHA512 1c1ef638e7dfa1654eb0310a4d0f18c6340ff8747e6943604e393b8923e199b7452843659aad2907e8c0dad8be729ce55a36b3f2e01ebece9af2869b2a485791 WHIRLPOOL e4f5ecc5c0b71055c63884f2670aae099faf8691b085ad0ffef25d264cd207499d2aa5d074dfe3e7b80b92ab4ab1ce0b758d46f56398cdd5be571432593c7cd1
-MISC ChangeLog 12969 SHA256 1c9075c0a77e89126b86fc8990e81634ddeffe45d0f9abe9202ad724e3f05391 SHA512 78b29d0451978e8476322b7bc6b46847be693bd3249b6284607bf0d73a2411242ba95ea8c05008bee88eea37842bed5dc516ad7a6eaa08ed551f8c6a66f570d4 WHIRLPOOL 087cb37367d220bf862430b2203c3fba3adbaea1b4ade2c10851bc2bb912a38e9bd91b5a2b05b02cfa0886170a00bce716a74c966b130ab2cf700dc28b395533
+EBUILD x264-encoder-9999.ebuild 2253 SHA256 dfd2ae7d8c89a762956bb777157c84dda6dfbe1bb93e78349379e34378a77971 SHA512 197977e24ae95fee151bba8ea118751d5de48b0d507ed6b00f28f9a514d7e2e967dea5675bed637aead60172bb5a7631b2c8cadfb73b4667772bfb3796f7ac25 WHIRLPOOL f80af3e176ba869fd438136a53783a890d94b306bf670b5ee8636c2b02baaef83f15cc40db53370af6040308bcdba50ce375c3f7eab811317402574632f15657
+MISC ChangeLog 13093 SHA256 dc7a0f7ff815fcf779e6354632d0d802b5ebb1f5e3dd3dfc06b2ed205b307d99 SHA512 1221e6b5ba7462ded9c996bbb136c41955691e10acffe2fb2998c24d2d16dd425d0583360d7d0e9d5510a98ebc38e111b93bf77651bb1451dbe3296522cef8c5 WHIRLPOOL 92343f5156ca1268568850f940c2eb6a894b81b6636469c3e62be2548786b9ee0dcf1061c16797818cb0f3e355a5430405a0708bcf4c8e5e72e305b366a2e2ee
MISC metadata.xml 593 SHA256 cab69e07127b5c284546cc62f3c1c59bab27c18c23b0f907c74066928d98ecab SHA512 ee0e34f611e2f6625177c2d58c78560558a99d87e965c56dc079fa1ce36f737703b1a866fc3f624e3f19dcbc9f9ba5167dea5d1ac316551d366e48c76a20ac42 WHIRLPOOL 98c4b143354284ef6c81e8e6901611076de5d96d7afed73c518617a2a01bf4180077f02dd21484cd6c86f2c9fb990f5637c8ad3a8a631916728644fd44cb6146
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMcQEMACgkQvFcC4BYPU0pcAgCgyQS7uvYGof3BTDHOycagblSU
+Cq0An35eZ7WTi2/6FA6egCKHr2KhQn39
+=OyY7
+-----END PGP SIGNATURE-----
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 5ae83b95e2a7..bf9f781a03bd 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.7 2013/06/26 04:40:11 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.8 2014/03/09 10:19:46 aballier Exp $
EAPI=5
@@ -49,6 +49,7 @@ src_configure() {
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--system-libx264 \
--host="${CHOST}" \
+ --disable-lsmash \
$(usex 10bit "--bit-depth=10" "") \
$(usex avs "" "--disable-avs") \
$(usex ffmpeg "" "--disable-lavf --disable-swscale") \