Version bump.

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

4 files changed, 79 insertions, 14 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b45b645efc85..2a3d7383d7da 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 DIST ffmpeg-0.5_p19928.tar.bz2 3072838 RMD160 06dfcade8584f357f2f2ce46c3cb9ee688c1229c SHA1 5448a649f1f518c960affee1b539126f8bd91dda SHA256 69923188435c31ed546d955281c4ad5ca5f4eb7793227152bc2bfe98824e80bc
 EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630
 EBUILD ffmpeg-0.5_p19928.ebuild 7602 RMD160 dfd06efce1b297ef3e100d0821bae1454eddf962 SHA1 5481e95cecb697265e215688a47628b048ceb8ac SHA256 dd3c448b3262aa431cf92175d935265e4d8ed50b0a541dc9a3594e251725606f
-EBUILD ffmpeg-9999-r1.ebuild 7625 RMD160 9bdbbe8a7c26103304fe2d3c699bb27349bb5845 SHA1 1bbb9d2ffb0e988feebfd719fda448a2815d924c SHA256 04db7bd6ba2a9c8f04d0c0cb505ceec8d6c4fd9552b78eaf5cb7ded655be98ab
-MISC ChangeLog 48485 RMD160 5c5bcb12abe9554a655dc45d4f429bdbd4b6726f SHA1 e5c81835faf328281e383920121212d4b3e5a6e9 SHA256 75045cf8535c02c1e907e894ff4c07ac4321c76b461761ea0c6e25d001232fee
+EBUILD ffmpeg-9999-r1.ebuild 7625 RMD160 d861ed0b1224221cbbf9e3dfaa081a4ae9a98383 SHA1 1f961c087c71bd1ee229109b4e2b1b4c97e35bb4 SHA256 83573b0e73dad3842a1eeb2e0ce0e48f984391b660eb2be5ec54befabe0d0d3a
+MISC ChangeLog 48580 RMD160 384332918aa5abe09254975edf334bc31f04d747 SHA1 60bcf25c2309fb7bbb2fd5f9e8aa88a4bed091cc SHA256 64e981268fa2b6fa6f56b4a843be287598f853aebffd5f4ef899e85c0fb6ff98
 MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrgdHoACgkQvFcC4BYPU0qWJwCeP7YviKA8UhKmLFkcDX+Hfqwr
+pu8AoIZFYkCl7TOcCgqCoIRCytAqMmk6
+=ZDV7
+-----END PGP SIGNATURE-----
diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog
index 78db8bd69b86..3926ecf3edc6 100644
--- a/media-video/x264-encoder/ChangeLog
+++ b/media-video/x264-encoder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/x264-encoder
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.23 2009/09/23 21:32:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.24 2009/10/22 15:03:52 ssuominen Exp $
+
+  22 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +x264-encoder-0.0.20091021.ebuild:
+  Version bump.
 
 *x264-encoder-0.0.20090923 (23 Sep 2009)
 
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index e2397248e4c5..523b919fffdc 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX x264-encoder-nolib-20081006.patch 1888 RMD160 7c903a6e4bc89a5121bb4b536c2263d27b0ed9e8 SHA1 fb43e39185dc5c071ad913a2acafc0bbc3603e45 SHA256 73f1f0eda23f7f28b52882800b312f28db7d5b4fa497017b7b1bdbd42d26c53c
 AUX x264-encoder-nolib-20090408.patch 1890 RMD160 9cf44cb1aafaa042fdc319276c027a8a2bb40757 SHA1 745546561f048f09646b4c4ff63896c44ecdbdc6 SHA256 78bfd1758c366e7c3101cdcc9f1cf60d7191205e45445a918edb29e33bdd9739
 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa
@@ -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-encoder-0.0.20081006.ebuild 1802 RMD160 0b2a163f38ae689124151a7f774420a7632e0748 SHA1 16db9d985262045fa16540fced953c32634f6009 SHA256 78bdedaff123ad9f310947291a83ff64e2c122e2cb88ecdc718ad708bbe2e9aa
 EBUILD x264-encoder-0.0.20090502.ebuild 1810 RMD160 ed96c097af487a47fde4b19eb98b66e4104850a3 SHA1 35e218ce253709c22f0938b2f203065cdf078eb3 SHA256 1bd2043df93ffa2fac6f763dee7f634eefe6f2d7dd28c0944475953eae244156
 EBUILD x264-encoder-0.0.20090629.ebuild 1810 RMD160 03a28213206a655b9c4d3e1a2d50b0d47a9863ac SHA1 4ef7a0627d501cc493e7929fed27d91a1be6b02d SHA256 02c45dc49388f1b906199f0e548fa08d2f4576357954a03f66952ccce712aea1
 EBUILD x264-encoder-0.0.20090908.ebuild 1559 RMD160 b27189de1813303d9fddf06709c66cd5b8bc02a2 SHA1 5a84ffe39d12ef25743cd0e875468048591c92f7 SHA256 13f325289bd673275e214841a0c47024941c34e077f75a243efdd9172b1194db
 EBUILD x264-encoder-0.0.20090923.ebuild 1558 RMD160 661a3a5ed0c15518a2ea51aba52af3f1fcc4aff4 SHA1 5a2e0004a0cad03e0912fbc02a7c8949c2e952d0 SHA256 17edf041ef4574ae8b8cbb3b5ef140df36081f7fc1047d3b1c514e06711c96fc
-MISC ChangeLog 4165 RMD160 3391d02b2b449c1b1b1c9cb62f65e4d6430b6820 SHA1 51240312716080a2d427ce7823c60953bab5689d SHA256 bf4397270cc866f7ad2d8d02be4c78b0807e553d22ef1a2f8252b0aa9502cde6
+EBUILD x264-encoder-0.0.20091021.ebuild 1559 RMD160 7adeddfe86c77318e0fcbf6347c04fb4bfd744f1 SHA1 e0539b538985a8b1d885b647cdc907ce613f1876 SHA256 9ef5cd44f9283a0b34cff04cef15d31e3b63dee2e605879f948740a980edceca
+MISC ChangeLog 4274 RMD160 62e6b0d6cc10be93b1635524a89d702cf13ed748 SHA1 63b1acd44a988aebccf94a780677e9ad4688a8f6 SHA256 7297d0c85e851c7ca86fd687d05650a712328a6f565bb942ab5aff43a34bbbfa
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq6k/YACgkQvFcC4BYPU0pB+ACfTVaAMtiEXSQ34179Dk2y2Fwz
-ChMAn3Bav2IRPgy/KX/EKYuTP8xzbUQU
-=TiHI
------END PGP SIGNATURE-----
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
new file mode 100644
index 000000000000..0cad0360c027
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20091021.ebuild,v 1.1 2009/10/22 15:03:52 ssuominen Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs versionator
+
+MY_P=x264-snapshot-$(get_version_component_range 3)-2245
+
+DESCRIPTION="A free commandline encoder for 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +mp4 +threads"
+
+RDEPEND="mp4? ( >=media-video/gpac-0.4.1_pre20060122 )
+	~media-libs/x264-${PV}"
+DEPEND="${RDEPEND}
+	amd64? ( >=dev-lang/yasm-0.6.2 )
+	x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm )
+		!<dev-lang/yasm-0.6.2 )
+	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-nostrip.patch \
+		"${FILESDIR}"/${PN}-nolib-20090408.patch
+}
+
+src_configure() {
+	tc-export CC
+
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debug"
+
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
+		--disable-avis-input \
+		$(use_enable mp4 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
+}