Version bump, pull a lot of fixes by Nikoli <nikoli@lavabit.com> from the live ebuild. Add custom-cflags USE flag with workaround for bug #376925. Also contains fix for bug #378303.

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

3 files changed, 99 insertions, 4 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 8a308af09a7b..1f4ceb09ea82 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,13 @@
 # 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.57 2011/09/03 18:39:24 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.58 2011/09/07 02:24:28 chutzpah Exp $
+
+*x264-0.0.20110825 (07 Sep 2011)
+
+  07 Sep 2011; Patrick McLean <chutzpah@gentoo.org> +x264-0.0.20110825.ebuild:
+  Version bump, pull a lot of fixes by Nikoli <nikoli@lavabit.com> from the
+  live ebuild. Add custom-cflags USE flag with workaround for bug #376925. Also
+  contains fix for bug #378303.
 
   03 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> x264-9999.ebuild:
   Fix SRC_URI & some cosmetic change. Thanks to Nikoli <nikoli@lavabit.com>
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index f5d41904d3f7..fe292612ce3e 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -6,12 +9,29 @@ DIST x264-snapshot-20100605-2245.tar.bz2 422713 RMD160 379b728d53b642bb5ac6d8276
 DIST x264-snapshot-20101029-2245.tar.bz2 449078 RMD160 65691ea49254ac769a1dde5c03bbe190d7758390 SHA1 3153e901b69acbfcade2af9a59b52d357166ece0 SHA256 d6d1ac9450e2e345d6a4bf7e62a9b03256b10da8e4d62c829ba683a7566711f3
 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.tar.bz2 514353 RMD160 6aeb636d7b395969f9ad2a0e72ffc9ee0eea9e48 SHA1 d551f6f7482c6af022cdaded89668a0579bd88d5 SHA256 55afee361554818ccc4ee553d3d058a7fb584af155ec7eeab45cd778acec43c5
 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.ebuild 1865 RMD160 bd33f8fe0529fb9f4fa2d3014fd7ddcc841ca5cb SHA1 4555dbf72bcacf08a344af8434fa8bd412792d89 SHA256 5d508279c0f4461c54e8be3c92d429961bfbfef6d628522aa8883cfa39929ed6
 EBUILD x264-9999.ebuild 1800 RMD160 c51dd8ef3e3c5a36c379192afe3c822a1ae51aed SHA1 76747a28e5a39a4217c3e9dee09919c33b8491bd SHA256 3cf0076031f6e6bed11988278369110cdc04e70745c50e54cee97974a07996ad
-MISC ChangeLog 8360 RMD160 3c114a6d10c83906af1c427bcea1892b116f2b54 SHA1 23b471aa37ef96989f440927cc2a8ef00b07714f SHA256 2cedd657d6d2d576fbd37df00a4fd587374e97e700fa69136be8ee9cef3d15dd
+MISC ChangeLog 8661 RMD160 aa1795caa320d07a863180c4d261557be9642237 SHA1 c5856408c7bd3745676743294c3ec233e7ee49ee SHA256 c6eaaf17afd119e81582299c9fc21bf49033dce8b1fd4a4c7e5cbd0f2fc3d07a
 MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c
-MISC x264-9999.ebuild.orig 1792 RMD160 9d69c8ec8963ffde50aa4baa7ff924fb767e8d8d SHA1 231a390e413684a8706ce40e40b83fb9fa9503e5 SHA256 8f79cbb43251321afb04d4a3a83f32ffceb14261678d97f7ff40ac3813f8f056
-MISC x264-9999.ebuild.rej 304 RMD160 de5144a93e3bc0f2e663f3fda0d24293478cb783 SHA1 9efc9ebc5fcb74bd1ad834bf069e4f5c0785e4e8 SHA256 c4e15a06223f8246221f358ead2a492d546622d7f8d7ca3426c7b78dc8b1803c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOZtXsAAoJEHy/RO9cNQiDa/EP/jlDw/9d/RZBbi7YnaswTiZs
+989OQlgGpamKJKzm3rgkUmHj4SPiYS/JXtUGX8zDarpulZE+Xo4dq3BTACQ3TQar
+/r/I1gFKptMfo/ba1DJmQm9UOv1HJxQMrU4FfBUqIEV5QqNLbwD5OX+oEOlYKMxE
+/V5U1EG5dIzLGNr6wbGHfFHv9k9ieb2SzTLtbcwS9Hhp+4NmW4KAakI7GmgrFxEO
+Fh+7u2FJsD39I89F4pzEcxAdgTMnHqMYmRnQR5sgiBUo8QRTye+SPofGeOvr6mpO
+2ZRVguTWzy6etwWjhGb0r1IP7SmfEcJtnUk0mUnnZspCeQMwWgieIuQN2U9EuZwR
+djC8xotBjVOhWUomILs+qH5Y00YnP/3Amcw+DnVBJSwERAH55Ocmv1WwMiO9y3P1
+S2bC5P3crq9dOGjkIufAAfVtdwH62Xl0S8erA8MObJPngAssRWjHBi1ArEfnW0E1
+9SOvXXdK061uuBrDEXxKl5Vl2mhOjZv2m03HyJ2dOL6GfPeEOydIUrpdDYPjKE8T
+DHudV/TG4HjTlzhaCrCbMInM8cNAmCQaRhSMmf2nT9IFG0XzpARq5p2nDmJExqxE
+EGARqc/1PNgWIGzeM89aOI9LbHf+DJXUqfLJlWHBfsciSNkz2AMP8W4xtah5q6vq
+LJpsCyJpBGdMFGavrd4Y
+=N5VQ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/x264/x264-0.0.20110825.ebuild b/media-libs/x264/x264-0.0.20110825.ebuild
new file mode 100644
index 000000000000..6e46dbd47e32
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20110825.ebuild
@@ -0,0 +1,68 @@
+# 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.20110825.ebuild,v 1.1 2011/09/07 02:24:28 chutzpah Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P=x264-snapshot-$(get_version_component_range 3)-2245
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="custom-cflags debug +threads pic static-libs"
+
+RDEPEND=""
+DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( >=dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS doc/*.txt"
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use debug && myconf+=" --enable-debug"
+	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
+}