Add enabled-by-default "interlaced" USE flag to allow disabling of interlacing support. This can speed up encoding by up to 2%.

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

4 files changed, 27 insertions, 10 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index e919158d0247..c1cc68f2c3ee 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.59 2011/09/07 09:04:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.60 2011/09/07 17:56:15 chutzpah Exp $
+
+  07 Sep 2011; Patrick McLean <chutzpah@gentoo.org> x264-0.0.20110825.ebuild,
+  metadata.xml:
+  Add enabled-by-default "interlaced" USE flag to allow disabling of
+  interlacing support. This can speed up encoding by up to 2%.
 
   07 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   x264-0.0.20110825.ebuild:
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index c6328f84bf4d..5c5c2c00d9b4 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
@@ -14,14 +14,24 @@ EBUILD x264-0.0.20100605.ebuild 1502 RMD160 70f9d093035eac1511eac5f3ef001f88e17f
 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 1869 RMD160 179337c6978ff514b7cca24e892f5faa37e7d959 SHA1 317c4e6a85d3f951f275c7fcd6844c8f25123bb9 SHA256 3ad244bcc87b487bb2efb8316a898c80726e859901dc3df03f6758d1bc2d84f3
+EBUILD x264-0.0.20110825.ebuild 1931 RMD160 7b78e42e7a898d36424bdcfc247bebe27da1abaa SHA1 6d06d96e298c123a6cd8031dd3b03fab5e46604e SHA256 ca488337ede696565ddfa166d8f86abcb2ddd9f77e6acb585039bb4640d1b951
 EBUILD x264-9999.ebuild 1800 RMD160 c51dd8ef3e3c5a36c379192afe3c822a1ae51aed SHA1 76747a28e5a39a4217c3e9dee09919c33b8491bd SHA256 3cf0076031f6e6bed11988278369110cdc04e70745c50e54cee97974a07996ad
-MISC ChangeLog 8794 RMD160 e6f8ffea5119ad0feb3445aee00b21b1cf9488a0 SHA1 c21dae8ce7d303eb19ae2961518e4aa2623d010a SHA256 68d883b6ed21800499d58aa3a8ed0b4714da395a18e041b0fc89108579d4504a
-MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c
+MISC ChangeLog 9020 RMD160 6e2379c313eb8157a51240180e4024ec28c4dc37 SHA1 4204142182a5bbe21ba4f37f282cfc455a9afbe2 SHA256 c22c9c1a1a21c9287cd771e5809ad5e79b293fb8f9f1c11ca1e8f8405a7c071b
+MISC metadata.xml 451 RMD160 dd6ec1d410a4192d4e93a3a94c06541f97afc91c SHA1 903c799299921137ac8b17270a76a030954f1272 SHA256 b29197959523b14be5a7cad8ec4f649592fc67e6e55b425835d6f297d0a89d79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5nM58ACgkQAiZjviIA2XgUKACgxh1mJZVMLz3Xsm4g2b/acryx
-6AsAn3TaoihZrnx6BPnMvaObzZGQLOK/
-=G4xS
+iQIcBAEBCAAGBQJOZ7BFAAoJEHy/RO9cNQiDrcMQAMmUuJT+9irsZpJ/QLO7KlA1
+xZBF8PiUkwh/kp4qjxClEH8lPiLCeJGOgvKqn9dHZQj3QEf+63ri4gjzn5zvvARM
+B6jbcp8dCVY5QwYOU1R6PUxM3GZDOtWTSMwO8F+xyf1m8E/BZECrpdMwGhYv+pfl
+3cVkubgh7cMYH/a6hhwc8famMkWwKl7eWAIfQ/f2Yfar5QBxve8KPUgZ52WD+hJP
+Z+pxDEcMnDcThigWJCNf4BZlCqPLfGg2QFlU7+F5D944YLIysW0QxFDSOeg6g6XS
+i68xnfEmxsqNARdZpZ7FXgpjBMCXzf7aXAbUGc+oXZQZmjoQP3UFvoh1pKQRv9Ox
+yxRkh9eMQkB4SCvLzVJGpavTD/Ew0bcAEYK2VFB2CwTz7U9sAi36wpHJJXbwh/Kn
+cHj2gf9549oT/VH9blyfwdEXQDAt59aDp8V/ZITmJEhRzWyGuSoZyCyCSx2yMQpU
+15G5D09zozlhVQpqSsmtDwfr9QEcfXfkPL2bJah2j43h5e4I8zXDnwLan+4x5sb/
+5jXBNoms+ycmLyQgbwkSi65kz1JUKfsrqQD6x92cPcbb7GLtO+3Kke7l9iOigm7z
+aiG3/zdU3LQG9m/yfkEaCFzfCx3GXdDC156RLCWX+C0TVNLXy5jSUahulusGOSJY
+S+Ke7yrtSKu9idcsAl0H
+=kScO
 -----END PGP SIGNATURE-----
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index dc77ccda7e4a..321f7b28784f 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+    <flag name="interlaced">enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/x264/x264-0.0.20110825.ebuild b/media-libs/x264/x264-0.0.20110825.ebuild
index 388fc0ab3b10..01612d74cd4d 100644
--- a/media-libs/x264/x264-0.0.20110825.ebuild
+++ b/media-libs/x264/x264-0.0.20110825.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2011/09/07 09:04:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20110825.ebuild,v 1.3 2011/09/07 17:56:15 chutzpah Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
@@ -14,7 +14,7 @@ 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"
+IUSE="custom-cflags debug +interlaced pic static-libs +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
@@ -32,6 +32,7 @@ src_configure() {
 	use debug && myconf+=" --enable-debug"
 	use static-libs && myconf+=" --enable-static"
 	use threads || myconf+=" --disable-thread"
+	use interlaced || myconf+=" --disable-interlaced"
 
 	# let upstream pick the optimization level by default
 	use custom-cflags || filter-flags -O?