Version bump.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 78 insertions, 14 deletions

diff --git a/media-libs/x264/ChangeLog b/media-libs/x264/ChangeLog
index 8da2b0f72de0..673a28c0d3db 100644
--- a/media-libs/x264/ChangeLog
+++ b/media-libs/x264/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/x264
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.24 2009/09/23 21:31:18 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.25 2009/10/22 14:56:34 ssuominen Exp $
+
+*x264-0.0.20091021 (22 Oct 2009)
+
+  22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +x264-0.0.20091021.ebuild:
+  Version bump.
 
 *x264-0.0.20090923 (23 Sep 2009)
 
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 74657c88aaa6..0763024aa752 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX x264-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
 AUX x264-onlylib-20080406.patch 937 RMD160 4160694018d2ba426be7e4f84fccec877f031ead SHA1 f38122bfebdfe3a526a62982f97b6e24e8fd7e91 SHA256 08c6e6f2454f995b4ed4e555d7d9cf5c1d7af334db3761f6c0a7386411837ba4
 AUX x264-onlylib-20090408.patch 1034 RMD160 6a0005acf174943fc3ae0e9118f8e7a01015c410 SHA1 432bc7e5bf35790be9b1d7151b705fba517580b8 SHA256 95e3f5e24306ebaa28ba564ff1ddcda982b40bd2ac7e8d70b79ed7f2024b47a4
@@ -9,17 +6,12 @@ DIST x264-snapshot-20090502-2245.tar.bz2 2484167 RMD160 1afc8974fdc2c0a1d188dce1
 DIST x264-snapshot-20090629-2245.tar.bz2 2531066 RMD160 a562446169e7d3c5993cc74649c1570ba763011d SHA1 0d8276ff6d60a990af0f6e01380c01e20dd601a8 SHA256 c3b12b0645ebdb2162d63d51d06ec67145136b6a40a090611708ea3bcba1b3cc
 DIST x264-snapshot-20090908-2245.tar.bz2 2727924 RMD160 dddfe5d4f84568de8127cb7181e8b58aa70e32c7 SHA1 39803e45fff8023c9d729ce77fe33cd00c267ed7 SHA256 e7653b3d619744a184b35a130ac5338287699a055aa17a4963128c96485a83c1
 DIST x264-snapshot-20090923-2245.tar.bz2 2756270 RMD160 d3d75ba764e5affab1871210a36e684727eb0446 SHA1 60ac65ec46107dbb26b1b9eb668ebceab9453385 SHA256 6528d7ac1484bf0330c2720f3a32d6388e00e3b2daba890de4f147fb8de6b61c
+DIST x264-snapshot-20091021-2245.tar.bz2 2810743 RMD160 262098df8680d934f636b6a3f411c41ed94f8361 SHA1 880149600da36f5ca33e0bcfd08d623e5821d82a SHA256 d14b214bcf1cf832f8d2ec4a78630f7780b82877dbe959cf44c4d36c512535c8
 EBUILD x264-0.0.20081006.ebuild 1627 RMD160 a1fe74abc55522a7e0fe51798211cc35137cc63b SHA1 0aedadccac2a8b66663858b2ca667ac62d3e1ced SHA256 3dbf90d84ee09db353106d4b63778b570a646ff9ca013f7023747c578ac97bd8
 EBUILD x264-0.0.20090502.ebuild 1635 RMD160 18aff1629285b246b7ff662e6be1c827cc07f5df SHA1 98bfca67ce6e236ca981add873d68236fe041a64 SHA256 b8b1e8e2c25894d579ff0665a9ed82f9edeb0f56d78b3a11b41962aa804162a2
 EBUILD x264-0.0.20090629.ebuild 1635 RMD160 ba034d2651acbc6760dcb899300df9956ac37e40 SHA1 ead2f429b8a5327df81a4743f3a517534afb65c7 SHA256 f6f70201f707d26b7258ad9fc8ceaf4fcbcc29ca9af344d296d0ff2f19b3417f
 EBUILD x264-0.0.20090908.ebuild 1491 RMD160 1d9be105aae9ecdc6532d9a9fa75d1ec2b19f97a SHA1 cd52e3d73483d6833d2462f400fdc1ffae518c33 SHA256 fffc78f8fb114dfbf9dc28bf5dff8a9ecfe6b87cbaa0250079a3ca0786d56712
 EBUILD x264-0.0.20090923.ebuild 1490 RMD160 780f5f68c67ed7b6255bf997f8d12dfd188c097f SHA1 545269f1caea354f39d5a8f19da44984953efd66 SHA256 0259de3fda7d628ec2dcb951d37ec3b05abe70b92debf1a2668952432497df4e
-MISC ChangeLog 3691 RMD160 d51dd4af44f7817653ce17cc35d5fae3501e109f SHA1 f8cc1b0dd63614ff85e1db904f43b7cb1ec1ded2 SHA256 69a22f19c22bc816ec03932966004d4af92af9a5e227d7e6e5a1b50c1eb5a96d
-MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq6k6wACgkQvFcC4BYPU0rW8ACfWNYQrDhyftaMPndxhmELHimq
-hgwAnR7Dpj3VyQUjX48YLwGgBAuB1pkQ
-=MwKk
------END PGP SIGNATURE-----
+EBUILD x264-0.0.20091021.ebuild 1486 RMD160 1372249d9ed6c98c56cd3838347f05df252f84c7 SHA1 81aa07bde8936fd3c8d84ae1a70f36607cd2c60e SHA256 997ec912bd3fbc3fff2902e39b701c633eaf75435576d845642d794e04e8906c
+MISC ChangeLog 3826 RMD160 5f5d1491f541f8ef8a3a342d577f8effd458919d SHA1 6b4b233e1366842704598ea49ed6af3ec870ef50 SHA256 d57982f24c867727e86f120281b91a76b894565c02af9b200f96e6acb47db11d
+MISC metadata.xml 335 RMD160 782d171712950050c9e34479cedef18983e566e9 SHA1 68e8b7034a5abef5f25463e194936c8d4a837f72 SHA256 18b919bb52e6713ae3919ba49f66caa659304337339e6d317e95d04a6384d23c
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 92e4dbc04f50..dc77ccda7e4a 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>video</herd>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+  </use>
 </pkgmetadata>
diff --git a/media-libs/x264/x264-0.0.20091021.ebuild b/media-libs/x264/x264-0.0.20091021.ebuild
new file mode 100644
index 000000000000..0aa65b5f79b3
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20091021.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20091021.ebuild,v 1.1 2009/10/22 14:56:34 ssuominen Exp $
+
+EAPI=2
+inherit eutils 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="debug +threads pic"
+
+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}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nostrip.patch \
+		"${FILESDIR}"/${PN}-onlylib-20090408.patch
+}
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debug"
+
+	if use x86 && use pic; then
+		myconf="${myconf} --disable-asm"
+	fi
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-avis-input \
+		--disable-mp4-output \
+		$(use_enable threads pthread) \
+		--enable-pic \
+		--enable-shared \
+		--extra-asflags="${ASFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--host="${CHOST}" \
+		${myconf} \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS doc/*.txt
+}