New version using the 120 api

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 101 insertions, 6 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index bbca5ae73d32..19dbe8de97bd 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.63 2011/12/19 17:16:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.64 2011/12/21 23:05:11 lu_zero Exp $
+
+*x264-0.0.20111220 (21 Dec 2011)
+
+  21 Dec 2011; Luca Barbato <lu_zero@gentoo.org> +x264-0.0.20111220.ebuild:
+  New version using the 120 api
 
 *x264-0.0.20111218 (19 Dec 2011)
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index aeca947d7774..0ae42ff8dc7b 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX x264-altivec.patch 2529 RMD160 a898058a653d55a65ddd070285b649b8569b3215 SHA1 849970574883c079b8b63cdb0922018c32d43532 SHA256 e36a5fe0ff284e0cf7ee1ddeec06f2f083ff1d740e9317d82a3f83dc23a924e6
 AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
@@ -12,6 +12,7 @@ DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb8
 DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d3e140085358ff95c8e861f SHA1 0e8fff6252397d453b0f38cc0fdaf9699558194d SHA256 ab0ed4046a36093f00dfa572d7234c59cec5f6cb674d8bb0fe4e6bdd7604efa0
 DIST x264-snapshot-20111017-2245.tar.bz2 525683 RMD160 c8758e99017bdb7c70991e0ba35c4c79e3b34232 SHA1 8a007bbe5720f74ecbcf9f4fb71ad8cc6bd974d4 SHA256 b1b9450835ffece5079c9167d92c20486b97bb14fc33b34b1faf7443728d4c2e
 DIST x264-snapshot-20111218-2245-stable.tar.bz2 531234 RMD160 b60e78475239d7e187576e48c03c9e580379f43d SHA1 ccf6720a0b8d4078b1babee40c8b1bbde5ea7dce SHA256 8dc5edd9aa7fb0247605ec7db1bd48013849ec200d420d78ad7bce427d0db866
+DIST x264-snapshot-20111220-2245.tar.bz2 532402 RMD160 3e9dce921fa8d7a9dadacd6e9cc0d9a1ec884860 SHA1 8e1958383ba08d9dc4b3e6c0e209243111a10c39 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a
 EBUILD x264-0.0.20100605.ebuild 1502 RMD160 70f9d093035eac1511eac5f3ef001f88e17f0fec SHA1 fdadbfcd76a3e60198ba6d1ed09bea59a5b8b2d3 SHA256 bd8e77d53bfe9cddea913da054704d046676fbc47e6c6826a8746ebbf3d951b1
 EBUILD x264-0.0.20101029.ebuild 1560 RMD160 2da375a1037d09ce98325535258f8a1026114c37 SHA1 a76c6cf5f5870265b24dd93070e5dc7be91ccdad SHA256 a939a332f59fea480ac3b74141fa6dab75110de952629e27d504813d1cde4507
 EBUILD x264-0.0.20110223.ebuild 1526 RMD160 fb57c899f11215174009a1da6afcb0527f924164 SHA1 0845dcc3b312da131449e97cf8f77bdd6f5f9632 SHA256 760d2d03ce5b70789b6a9d137428e3263650ddcee8f7dcaae5063f5e6a0eb13d
@@ -19,13 +20,14 @@ EBUILD x264-0.0.20110426.ebuild 1519 RMD160 7b0b0a8ef5608f161c45290bca846cca6135
 EBUILD x264-0.0.20110825-r1.ebuild 2322 RMD160 c99dd517ef0665e0c7b0a21e5ca47fe82dc5443c SHA1 5c8c2eb23143c7ba098c9edf1e5f601922d368e4 SHA256 aba238d1961cd6a73a8d99d3767cb00484507b40b32aaa5f5de75037e44f2ced
 EBUILD x264-0.0.20111017.ebuild 2311 RMD160 142d266725fe661fb258c9a437bf0c05df9545ef SHA1 7c026a437f1007bae5ec51cc67213062661dd81a SHA256 808bdd2122404a782cfdf35576d98fd137e9ea944fd02160f4213a19e9bed564
 EBUILD x264-0.0.20111218.ebuild 1807 RMD160 9a2dac0b90e951ab3f6ed3f2a25456c49249eb22 SHA1 f96f13fcec0fa393cba520d698dd57c39e5e5458 SHA256 68c094e9aaa2f806fa8a770269ee73e51c4203208bb1e95c3ffda636608dc01c
+EBUILD x264-0.0.20111220.ebuild 2311 RMD160 f98565ddd7f31b7b901d2f56cb0d5eb54cb71d8e SHA1 706962a905e8a7114d8d18abf3e2890a37c8500a SHA256 28f4855712e5c4300d90e4f2f9b566d356485100e6420d4be1360ec3c57532bb
 EBUILD x264-9999.ebuild 1800 RMD160 c51dd8ef3e3c5a36c379192afe3c822a1ae51aed SHA1 76747a28e5a39a4217c3e9dee09919c33b8491bd SHA256 3cf0076031f6e6bed11988278369110cdc04e70745c50e54cee97974a07996ad
-MISC ChangeLog 9598 RMD160 d4217115cdb4b041ebe5ab27f649601c1d2f719b SHA1 153969f0411560d6bb4c09c4528d96ee725661dd SHA256 dd1ef1c99a327b96b5409f665023b722c8b8c255ec7a8c49e0e2b63370de798a
+MISC ChangeLog 9740 RMD160 1d2cba3ce79e527af2af3749b8b08489578ac00e SHA1 05ed69bdad535225025316c96234d707844218c8 SHA256 dd91d3800be8ba970a07ead97162b2156018920aeffa4501183f893c771399e1
 MISC metadata.xml 554 RMD160 2f57798883f3f6ceae8a0b596c5dd3fffd1dc90c SHA1 4dd25b830a0ad422d81de5500931f750b8508851 SHA256 1e4bcd3b571c5401aa3dc2f1e07801153596a4437d6309d1c7b6366e6cc552e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7vcYwACgkQvFcC4BYPU0prdQCfSN+E87GKxVeoJzA9M9huXF8F
-kroAnR5ewyLHwjAnGVA7i85zErdtNvgI
-=+Sqm
+iF4EAREIAAYFAk7yZjUACgkQYpJnKVbCxcwTiQD+NVigpuTyt9RexOOXeVb/AjiX
+NWxen6HxIBg2PtgrUfQA/j2t5IVB114ibB5nYysxHhHqYtMWjM1Xk3dEXM9Eex+n
+=+2gD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/x264-0.0.20111220.ebuild b/media-libs/x264/x264-0.0.20111220.ebuild
new file mode 100644
index 000000000000..0b027e7db02a
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20111220.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20111220.ebuild,v 1.1 2011/12/21 23:05:11 lu_zero Exp $
+
+EAPI=4
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	V_ECLASS="git-2"
+else
+	V_ECLASS="versionator"
+fi
+
+inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
+
+if [ "${PV#9999}" = "${PV}" ]; then
+	MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+fi
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	EGIT_REPO_URI="git://git.videolan.org/x264.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV#9999}" != "${PV}" ]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
+
+RDEPEND=""
+DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( >=dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"
+
+if [ "${PV#9999}" = "${PV}" ]; then
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DOCS="AUTHORS doc/*.txt"
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use 10bit && myconf+=" --bit-depth=10"
+	use debug && myconf+=" --enable-debug"
+	use interlaced || myconf+=" --disable-interlaced"
+	use static-libs && myconf+=" --enable-static"
+	use threads || myconf+=" --disable-thread"
+
+	# let upstream pick the optimization level by default
+	use custom-cflags || filter-flags -O?
+
+	if use x86 && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
+	./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}" \
+		${myconf} || die
+
+	# this is a nasty workaround for bug #376925 as upstream doesn't like us
+	# fiddling with their CFLAGS
+	if use custom-cflags; then
+		local cflags
+		cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+		cflags="${cflags//$(get-flag O)/}"
+		cflags="${cflags//-O? /$(get-flag O) }"
+		cflags="${cflags//-g /}"
+		sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+	fi
+}