New version using the 118 api

Package-Manager: portage-2.1.10.28/cvs/Linux x86_64

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index aeedb4d89f297fc2a546b4fc233021d456ebe826..b814583c1083f647dea11f56ef07e037cfa382ca 100644 (file)
--- 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.61 2011/09/07 23:17:44 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.62 2011/10/19 16:26:12 lu_zero Exp $
+
+*x264-0.0.20111017 (19 Oct 2011)
+
+  19 Oct 2011; Luca Barbato <lu_zero@gentoo.org> +x264-0.0.20111117.ebuild:
+  New version using the 118 api
 
 *x264-0.0.20110825-r1 (07 Sep 2011)
 

diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 179856322b9a68bc2595a1269928248781672a3d..e9c01ddf894084d0b87250e6a7f16f0eb700e54b 100644 (file)
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX x264-altivec.patch 2529 RMD160 a898058a653d55a65ddd070285b649b8569b3215 SHA1 849970574883c079b8b63cdb0922018c32d43532 SHA256 e36a5fe0ff284e0cf7ee1ddeec06f2f083ff1d740e9317d82a3f83dc23a924e6
 AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 AUX x264-onlylib-20100605.patch 1078 RMD160 a40e8e298cef462b2c1a393d56184c84a901eb28 SHA1 085e8c16226ad9bb1cfb7efe6065cd80a7c2f358 SHA256 557c818204143440b982bae758103898078d014d145176267329d368b2b44fa4
@@ -10,28 +7,13 @@ DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c0
 DIST x264-snapshot-20110223-2245.tar.bz2 485914 RMD160 796edaaaa4c0983e48202628abc1624445c7dac7 SHA1 68cf65982666390cec2d875c521090958e4fd338 SHA256 95c0287102ab4f9b736fc83a1a17b74f6d4b1725ccf23cc619d453293f76a551
 DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc
 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
 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
 EBUILD x264-0.0.20110426.ebuild 1519 RMD160 7b0b0a8ef5608f161c45290bca846cca613592d1 SHA1 641c87721f45986d837d5da9730690c078d7dc33 SHA256 20405a5c868e308166ae2126427fe948afcd60e82c7b7537ec28a35b98a4da61
 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-9999.ebuild 1800 RMD160 c51dd8ef3e3c5a36c379192afe3c822a1ae51aed SHA1 76747a28e5a39a4217c3e9dee09919c33b8491bd SHA256 3cf0076031f6e6bed11988278369110cdc04e70745c50e54cee97974a07996ad
-MISC ChangeLog 9326 RMD160 2faff6fd609ce916bdf9442ade51504d034ee0f7 SHA1 b9b5ebc8031445f35fa7ab35071255996924353a SHA256 6bada1f7d120538aecff786221589f848c6973fe50402d5704b75693667c79b1
+MISC ChangeLog 9468 RMD160 1d811d5ab71e13cd3fa10daf4754bdb0cef8c550 SHA1 37aea8b87dbb0c8ba0dbcd485bb476be4f7cb57a SHA256 bbb4687035f00860ff25e8b106ff4bda0b869a0d348cd246a526fb8376edb778
 MISC metadata.xml 554 RMD160 2f57798883f3f6ceae8a0b596c5dd3fffd1dc90c SHA1 4dd25b830a0ad422d81de5500931f750b8508851 SHA256 1e4bcd3b571c5401aa3dc2f1e07801153596a4437d6309d1c7b6366e6cc552e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCAAGBQJOZ/ueAAoJEHy/RO9cNQiDbAAP/R6pHw5hsgi9G7VyifwupyE0
-JA2HgO5TVRkOp+OYh8X7gc2Kmpn8vrgq35HpOQbhnxa0MHIhQEBU9GrqjXbJwyk5
-J9S+B91bOROaRMbq/pxMuzEaVZZkGrIvTY6jg1ZtjQUYmEc7qKtL6EMVMkQvmF+y
-6taLGmqcs3FKmuCRmNE5zqYr5z5QydTpqMWVppZ0DWg2jM+1ulZclVByT3ikt8EY
-19TVuU83OqO8yd7yYV7hPwvx18hQr2jLa3AXQ0UNZ1igWxpIjC2Ar1LZ1wujMLUb
-fP3h09ZrST3Kecnmz1BoPhlREXOaWGPFpVYRn7fb/N6gIOlYY8e9WappLxHD1PJt
-LXUNyJ5cvtYHW9RnWpt4yJrKIM5Yl8kNoP4f2AIubDQztLBbnyUCswC6ilPhfITg
-QvVCRLb3xyvaZXHSRItf4qFsL+bwEQIxqXeWdttAlTfiOEbiqLwhppatOzXecATm
-oeRA7rZkwx2D/5Ibx2uQkZkEj7bakE7qLCXaPequk7KWeiJ6hwfjxp1htQ5DWCZJ
-zKOULSWWc8YQ3Fk7YqaqGpRyqIwLdXoEB+T5UPoiSC0RorSCELlrevN0QXyzMVSr
-1KErP1EV4NnemMOcbnIn/wGymdNGKXCrw28JJCjbzf48AstFUNYb2dex2dz6Z/Uk
-XjAJJQcPGhY3Trt03GQr
-=rDHv
------END PGP SIGNATURE-----

diff --git a/media-libs/x264/x264-0.0.20111017.ebuild b/media-libs/x264/x264-0.0.20111017.ebuild
new file mode 100644 (file)
index 0000000..fa23b1d
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20111017.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.20111017.ebuild,v 1.1 2011/10/19 16:26:12 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
+}