ieee1394 fix

Package-Manager: portage-1.589-cvs

3 files changed, 22 insertions, 26 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e2dd308647c2..7db1cc2ad687 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.89 2005/09/10 09:53:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.90 2005/09/12 10:27:40 lu_zero Exp $
+
+  12 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050906.ebuild:
+  Fix ieee1394 issues
 
   10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   ffmpeg-0.4.9_p20050906.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 31f4416027bc..5f7120d74c10 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 7814b199a2d4980a2d7291576bea92cf ffmpeg-0.4.9_p20050906.ebuild 4761
 MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
-MD5 6fcf958edd7418da1e00e28932f334ed ChangeLog 14021
 MD5 5cf4c412dc53b728b65176157636473f ffmpeg-0.4.9_p20050226-r5.ebuild 4539
-MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
 MD5 bb5094085c4fff51dc773d7735117475 ffmpeg-0.4.9_p20050226-r3.ebuild 4393
-MD5 40efd0735975011f70500d402abbc0a2 ffmpeg-0.4.9_p20050906.ebuild 4709
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 b178003765926337759f84864fa497d3 ChangeLog 14124
+MD5 437df7598487b85a8678e49317d897b1 ffmpeg-0.4.9_pre1-r1.ebuild 4065
 MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1-r1 70
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
-MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
-MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
-MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
-MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
 MD5 e592f1aa79ce0d709ac4980404956e87 files/ffmpeg-a52.patch 1111
 MD5 b4ecc62e882107f766cf621bfc6c7e20 files/ffmpeg-osx.patch 5940
-MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
+MD5 f0c54c934c78216a2bd0b157028a6f84 files/gentoo-ffmpeg001.patch 752
 MD5 39cf7a98d0f59cfde5b82ab7fedf19d0 files/digest-ffmpeg-0.4.9_p20050906 73
+MD5 b1cd277309faaaa03e3dafb3b89b2a09 files/ffmpeg-libdir-pic.patch 6027
+MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r3 73
+MD5 20274823abfde904ae73478349585dd0 files/ffmpeg-0.4.9_p20050226-gcc4.patch 2319
+MD5 1a8c0be3a5a5ba1d929b7773265943b7 files/ffmpeg-missing_links.patch 1199
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r5 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIq0kj5H05b2HAEkRAg3sAKCFFnY6Zdpd5J86iLmL6926rUXt2QCgkEd/
-6SRe3D+W0Y6UBQhn7YCXYsY=
-=LKyH
------END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
index 9b7a8cfc75c0..8c2925790a5f 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_p20050906.ebuild,v 1.3 2005/09/10 09:53:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050906.ebuild,v 1.4 2005/09/12 10:27:40 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -16,7 +16,8 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-# ~arm ~mips ~hppa
+# ~alpha need to test aac useflag
+# ~ia64 ~arm ~mips ~hppa
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="aac altivec debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss test theora threads truetype v4l xvid dts network zlib sdl"
 
@@ -33,7 +34,7 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	xvid? ( >=media-libs/xvid-1.0 )
 	zlib? ( sys-libs/zlib )
 	dts? ( media-libs/libdts )
-	ieee1394? ( media-libs/libdc1394
+	ieee1394? ( =media-libs/libdc1394-1*
 	            sys-libs/libraw1394 )
 	test? ( net-misc/wget )"
 
@@ -61,7 +62,7 @@ src_unpack() {
 	# epatch ${FILESDIR}/${PN}-libdir-pic.patch
 	# epatch ${FILESDIR}/${PN}-a52.patch
 	# epatch ${FILESDIR}/${PN}-missing_links.patch
-	# To make sure the ffserver test will work
+	# To make sure the ffserver test will work 
 	sed -i -e "s:-e debug=off::" tests/server-regression.sh
 	cd ${S}
 	cp -R ${S_BASE} ${S_STATIC}
@@ -133,7 +134,7 @@ src_install() {
 	done
 
 	cd ${S_SHARED}
-	dodoc ChangeLog README
+	dodoc ChangeLog README INSTALL
 	dodoc doc/*
 
 	cd ${S_STATIC}/libavcodec/libpostproc
@@ -153,6 +154,7 @@ src_install() {
 
 # Never die for now...
 src_test() {
+
 	for d in ${S_STATIC} ${S_SHARED}; do
 		cd ${d}
 		make test || ewarn "Some test failed"