synced media-video/ffmpeg with main tree

4 files changed, 9 insertions, 9 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 97e5a6c26..376ead5f8 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -3,8 +3,8 @@ AUX ffmpeg-shared-gcc4.1.patch 1667 RMD160 cf0318bcb812ad701e8cd55f10f59ca71933c
 DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dceecdb5a1a174 SHA1 97262f1bc663c4bd4fdcb12e8572628174cceae6 SHA256 60af968bdcac2284799a2395d4d9cdcb5319493c91da231992f5f90cd663647a
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 EBUILD ffmpeg-0.4.9_p20090201-r1.ebuild 6543 RMD160 466776b70ab962c2d588e68c14298079535a07dd SHA1 f85b8486c7ef83880471cc3706c040fd1e8370ea SHA256 8431ff6e52480dd530f6ba2ebe780a1aea73c51ce2356789de27478944e0cf84
-EBUILD ffmpeg-0.4.9_p20090201.ebuild 6571 RMD160 70987f6ffcb4a05fdfcf2164d58bba2cb2319c84 SHA1 da91d06e4402d7fba9adcfeb5918ad56d1f905d2 SHA256 062c86fbdfe5ae0686ad8740da1e0199d677450dec13747cfeec3c7ee9901437
-EBUILD ffmpeg-0.5-r1.ebuild 6433 RMD160 603fb7875b0f6890646f6f05d0f972a5008a6f49 SHA1 701a820a3b95020b5fae2d3c121ae163278adc6b SHA256 d60adfe6abb70570ac17df5b2d777207ce9b19826b0cdfaf4a5308dc6e51b5f7
-EBUILD ffmpeg-9999.ebuild 6322 RMD160 5f863724c94c912a14bac6391311f611c18d5066 SHA1 df0e33cee33d3ddf83e5a638fb6c8dd359410313 SHA256 794a19f4074db507ccce1914be9e07e15d6828d0e2c8634ad114b876b1571107
+EBUILD ffmpeg-0.4.9_p20090201.ebuild 6568 RMD160 a80dba442e2207286910a947378fe9821d819473 SHA1 549397140221412a35fdc5bb45ea72c4f46712cb SHA256 438020daadc6d3768ec8d306ce434ec61fe4f31310824ee8f2de8f7c8d0c7fa4
+EBUILD ffmpeg-0.5-r1.ebuild 6433 RMD160 cd617c011278967c94385a80ced642067d00fa4c SHA1 5ea2dd727e14c61112ac27276bd4e81ae965cc49 SHA256 579e8c1f3d08467914cca4da1113844af688a26e21c830758a960f49cb68ad00
+EBUILD ffmpeg-9999.ebuild 6332 RMD160 2033c072d7b2fd66b3923df4620825ff02d107b0 SHA1 84552b0796db27ec6c450ba3831c98267876b045 SHA256 f865d3be2eb5f2d924462c52680c010d314e230312f2aef11720a2d3a7cf4b5d
 MISC ChangeLog 42299 RMD160 c498d2b1faf4a81b2f563ac6ccf7853dfe1428db SHA1 e2780f17244ddd85643553fb92a60914c7b21bdd SHA256 61a3970a9407afeaa8b2b1486b25d2cfcfa6253a6e569a9ee3f840dd842cf7f9
 MISC metadata.xml 1573 RMD160 befd4c2d30f834fda711f150843aebcc6f027b57 SHA1 a5128622bfb5d2c1bdc44e1542a2a09664516193 SHA256 7c1a4821aa99606ae3c52df66cf3a3fa8d32d94cfc0e07d346b203e6966a1183
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
index c517b8282..dbb27ad56 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild,v 1.8 2009/02/11 17:07:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20090201.ebuild,v 1.10 2009/04/04 15:05:05 armin76 Exp $
 
 EAPI=1
 
@@ -20,7 +20,7 @@ S=${WORKDIR}/ffmpeg
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="3dnow aac alsa altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis
 	  test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger
 	  hardcoded-tables bindist v4l v4l2 speex ssse3 vhook"
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index 551bbc6b6..96a40b3c9 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.2 2009/03/11 23:11:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.4 2009/04/04 15:05:05 armin76 Exp $
 
 EAPI=1
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 0ed5e2b31..d1aac5364 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.12 2009/03/11 23:11:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.15 2009/04/04 15:05:05 armin76 Exp $
 
 EAPI=1
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc
-	  ieee1394 +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora
+	  ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test theora
 	  threads x264 xvid network zlib sdl X mp3 oss schroedinger
 	  +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k"
 
@@ -83,7 +83,7 @@ multilib-native_src_compile_internal() {
 	# libavdevice options
 	use ieee1394 && myconf="${myconf} --enable-libdc1394"
 	# Demuxers
-	for i in v4l v4l2 alsa oss ; do
+	for i in v4l v4l2 alsa oss jack ; do
 		use $i || myconf="${myconf} --disable-demuxer=$i"
 	done
 	# Muxers