new snapshot with the accumulated fixes

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 82 insertions, 5 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 7cb5d364c6a2..11836ec1b33c 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.95 2013/08/01 17:24:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.96 2013/08/01 17:41:00 aballier Exp $
+
+*x264-0.0.20130731 (01 Aug 2013)
+
+  01 Aug 2013; Alexis Ballier <aballier@gentoo.org> +x264-0.0.20130731.ebuild:
+  new snapshot with the accumulated fixes
 
   01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
   Go multilib and stack for for medialibs r8
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 3aaa34772401..a3fea1afc490 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -10,17 +10,19 @@ DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececb
 DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe SHA512 915e2933596f4809a7cba25a6eb7f8a555daaeeb3a5a95a314cb947940d562e12d164f52ab6b94d7abd52e66ee986d3414c54685390a619357eef22ba0cd6a6a WHIRLPOOL e61b779d9eba7cad48899bc7eb88e9b5e140013d016792ddd4d2c149f7447d8bbf528615b751c095813519218bc7e3072ded407c386043dff8270d2c43a7ecb9
 DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b
 DIST x264-snapshot-20130506-2245.tar.bz2 608013 SHA256 da7055a457d19b97ff35a2830e7caae665ea06d22ddc28393168983d1cd21f61 SHA512 6ba35f6b39fefbda6990dc0fd674efbe403b0616f2f02d71ae3e7bbc6ce2bab8878a963dd5f306f8a2b3b9a74c5c0b4dbf9dfb9dc0e602b807f726cf072905b5 WHIRLPOOL bfb4b7dd0e865cd9305ac177f5c544555004039209dda695fcc932aab647b87c96f0bae4fa040276bd3dbee64dcf982f3c2447efdbc01c1d42f040c9d5d0af85
+DIST x264-snapshot-20130731-2245.tar.bz2 625052 SHA256 caa39660f2ddc9dc53033af709452a21479c7b7c715c5f9d744d0d452c2d9e67 SHA512 2abcab4013dee9ac58779afd89fc558a8286cf33affda037e95a7e10cf00387cee1ad461ac59c5020fd9b72d303170f16d4e4b5593ec21528a33b0f530878d9d WHIRLPOOL 6f7fcc1c05c47a0d31578fbd0268b84ba458a968b087fb7d1050f67739bec140a1c3ded288cd0000180b5be921b469357ec9cdc363fc1eec82d82bd795557b56
 EBUILD x264-0.0.20111220.ebuild 2289 SHA256 edf89ceda65eab31f55d66385245eee6481ffb6d9cb0bf39eaf275e1540359c7 SHA512 2783dcb8babb4972de713f68f544974c463e2e1250485afc5ad9513087b3067d630adddfcd07f79ccb19bc5b6b1ae7f0ddeaa27babfb156aac45873e6768bad5 WHIRLPOOL cf521d2495ca285bb0090b457273717ce8cbeae6718f4b9bc08c229837f4fc04dfe284278fa11eef6131053aa3fbb5ecaada8b65063fd380735796928c99472d
 EBUILD x264-0.0.20120327.ebuild 2369 SHA256 652c96142181d3339fb820c0add88ebc21646daf74b24c3bb9b1eaa88737dfc1 SHA512 f90c9af66c75d4f445f1a7443180b8bc4885b0b6be5c64d2c13633ee2094a76dbc74dc33241fd03bba5dcba293df130d45aeb918d8d0b131e8912918583b06de WHIRLPOOL 029fd0b95c4b29e36b6e3cd01671dee797a999631b4a0c086606718295a41ee1c92f667a75d29b1556e2d62a69fd542c323461350f32ff3537ad5706f43fa71a
 EBUILD x264-0.0.20120707.ebuild 2880 SHA256 c1058ae73c205292a5ef7e6e8afc48293b74258f353f796a11518e9e78c8f60f SHA512 2091ef73ef17a7fd84ddf41e03593f0b224c1eaa8be8a6e2410ec3352a8146b19e9e89bda5c9d5fcd3a6d9306b126bf96a32f196288b2aab7c76deb82ae8d82d WHIRLPOOL 0ec1b5c56d0e5af2fb285f2f6d662e73e0449ee0a1dcf31fe2d54c82cd26d9bde03f5ffd95ad8350fee1b5de9552663d553a9ae8b87115bfecf2652a4bd1cb9d
 EBUILD x264-0.0.20130506.ebuild 2303 SHA256 0087e7edbb66caa01bddaaee8f5ef50ce4d17cf0265c840f13967acfdd358bd4 SHA512 c98aae7c6f938a6df1d238295b710bf035868c55c4797f0c87ed90dc47ab5a5a3deba640fd2e63c3931ed53a6816d1164c7a5a77aab1a1fcf98d18c5e4ca735f WHIRLPOOL 5792a11a81c61c814c6b0e644dd381c0e3f832dfb1c4c844a2e606cadaaa8d8cdced3704fc6251350234a5b7a59c806c689f942d30259a22e386147d315171f9
+EBUILD x264-0.0.20130731.ebuild 2088 SHA256 1dcc1d67fca1210328ad04a0b9dbd522ac9de13d3c762201ed46a3463ec8f4ec SHA512 99b507ba21104ee9bf34fbf5c1cb59d1bdd61b22a9d637cb4845a987f33b011292777ccef380a61ef87ee13226f77a3bf5a459f9c868d4a39347fdfc6a6275fd WHIRLPOOL 22f8ce9ee8a450db5dc96e6a2968de7132663597bf0be0c95d59587b6153263752f69d3d2d17bcdfdba6b968645ec4b3a8068df7184d7dda55de1d2c0899c5d8
 EBUILD x264-9999.ebuild 2081 SHA256 6989e1acb2c042a328262f21df137c7b0f68ecf0de432b2b8fe633493cd85936 SHA512 cbfaeda18fe00c9141214890130387405ee2e3dd3bdb1a34e5b52244c87f6373655d68150a54f256d3818619c7390b2eca3312a1b220a611670104decc971ad5 WHIRLPOOL 4a8fea641937e4df1f45e9ea1c4f9f70f250059ddecab4f271e62256f659afb95c857771438da47bf576e2cb4dc67c1671a38976d727e6594a09266e18cb5a5b
-MISC ChangeLog 14268 SHA256 d7db5d9f9e2940e70707be5c8ee7b74f87f7a959a8e8363fe0baf5a76614fa73 SHA512 6934962b5d5effa319da67bbd31cbab2b2579586de59e37adbf8f3540280bbafbde1aef62f9bb2c3a2a5c46be74f3208c9dbc30431aa81a37e21460a7f495343 WHIRLPOOL d9efb0b8996060df98ed0d949fe9bdfcea180a9420dfb8c51eff92f8170c22fc7bc39e0be3b44225034666b0b04e495a2a507e1f2381675771b412be8524ea22
+MISC ChangeLog 14424 SHA256 0fb8220c4a2bae6813293fc48c0bd6f84fdfc75ae0c7713d78afe392d64c2199 SHA512 4c6247430b6724a9aee91ba159dd5ce68bf3bec70029eaebbcf3b23245acab1455cc19d21f17dedb75217611473f6450438583839177fd6fc2202ea51b9c6b0f WHIRLPOOL 0ae4a067cb93b017b13351f70c36e8f1ce4e0e253361819842568e335d673e87cc1c4380fd5ebafd000f9706ae59a0d7dfef45c65e398bdef214e5c3b5adb7d8
 MISC metadata.xml 554 SHA256 0e6f02e5e6503d39334d4c0e02fd983b554af214819ddfd9eb24dea6dad716f7 SHA512 db986ff0e3509ca49278e8bc4f5a8b4866209e8c49f8fb49724f28ac6e42f8d863ca73a0337945c6344054ce07965a08b86ba6f0e34c9cc6dad5217e8309d1b8 WHIRLPOOL 38de13fe7848bc1b20eef69935d8a8bf575bcd339a5f77ef8724ff74e2ff700fa6ddf85544c33a27c0587f3cc541a49a98ccf2298b94f6a22352168102d0c3ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH6mbQACgkQvFcC4BYPU0ohcQCfVrhs8kNvRbuqKjf1EIFH6rvh
-0lYAoLA1j5JFzKTEalSdv2u8KEqWo3iG
-=kqvE
+iEYEAREIAAYFAlH6na4ACgkQvFcC4BYPU0q4iQCfZYyyQggdf4IR2HZzUMHR+H2i
+2K4Ani8Tf15TvN5vCgc2texZR388qQIN
+=XD36
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20130731.ebuild
new file mode 100644
index 000000000000..123e00c533e2
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20130731.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130731.ebuild,v 1.1 2013/08/01 17:41:00 aballier Exp $
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+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 ~arm ~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
+
+SONAME="135"
+SLOT="0/${SONAME}"
+
+LICENSE="GPL-2"
+IUSE="10bit +interlaced pic static-libs sse +threads"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+DOCS="AUTHORS doc/*.txt"
+
+src_prepare() {
+	# Initial support for x32 ABI, bug #420241
+	# Avoid messing too much with CFLAGS.
+	epatch "${FILESDIR}"/x264-cflags.patch
+}
+
+multilib_src_configure() {
+	tc-export CC
+	local asm_conf=""
+
+	if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
+		asm_conf=" --disable-asm"
+	fi
+
+	# Upstream uses this, see the cflags patch
+	use sse && append-flags "-msse" "-mfpmath=sse"
+
+	"${S}/configure" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--disable-cli \
+		--disable-avs \
+		--disable-lavf \
+		--disable-swscale \
+		--disable-ffms \
+		--disable-gpac \
+		--enable-pic \
+		--enable-shared \
+		--host="${CHOST}" \
+		$(usex 10bit "--bit-depth=10" "") \
+		$(usex interlaced "" "--disable-interlaced") \
+		$(usex static-libs "" "--enable-static") \
+		$(usex threads "" "--disable-thread") \
+		${asm_conf} || die
+}