xvid

Package-Manager: portage-2.0.51.19

3 files changed, 21 insertions, 25 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 74a1721923d3..75b67c13bf7b 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.54 2005/03/09 22:39:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.55 2005/03/11 06:47:57 lu_zero Exp $
+
+  11 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20050226-r1.ebuild:
+  Put back xvid support
 
 *ffmpeg-0.4.9_p20050226-r1 (10 Mar 2005)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 08d83fe80ea9..4754b2d354c6 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,32 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5ff8068676ed8fb2852fc1bd0aa98eda ChangeLog 8036
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 de878cc424e3dc3b3d1a15fa1565fb97 ffmpeg-0.4.7.ebuild 2201
-MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
 MD5 b28732767da5cfc6e18c8ddffaf5c6ed ffmpeg-0.4.8.20040322-r1.ebuild 3756
-MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
+MD5 aae18a15539a110fd4ef3199cc2b4f94 ffmpeg-0.4.8.20040222.ebuild 3367
 MD5 c57ec7ef531e1088a91de5d6d9ba1dfa ffmpeg-0.4.8.ebuild 2430
 MD5 b426bb275301556b7556c9da9b54b385 ffmpeg-0.4.9_pre1.ebuild 3676
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 641f52478570ad5499656205563177c9 ChangeLog 8143
+MD5 16f425b8ee94a78fbeecacdf3c728242 ffmpeg-0.4.9_p20050226-r1.ebuild 3895
 MD5 d3856e4fa892514cb368877e255f234f ffmpeg-0.4.9_p20050226.ebuild 3270
-MD5 6bfcfe205b20e3c2ad1ec95b5eca6274 ffmpeg-0.4.9_p20050226-r1.ebuild 3845
-MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
+MD5 9898dc0c81badd38f0d98074a511efa3 ffmpeg-0.4.8.20040322.ebuild 3327
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
-MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
-MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
+MD5 3ec4083f7fb077a5a3c40d1dd46a9a1f files/gentoo-ffmpeg001.patch 1098
 MD5 56615d0a04f7435f464f01f8bed50c50 files/digest-ffmpeg-0.4.8.20040222 69
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
-MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
-MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
+MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322 69
+MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
+MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226 73
-MD5 3ec4083f7fb077a5a3c40d1dd46a9a1f files/gentoo-ffmpeg001.patch 1098
+MD5 e16a2db90cc2c151bdba748297e137dd files/digest-ffmpeg-0.4.9_pre1 70
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 99176b97ac8dd94ffc1d23961cc54906 files/digest-ffmpeg-0.4.9_p20050226-r1 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCL3MbFdQwWVoAgN4RAleMAJ0eKeFTIDrbvXeOpoFQfQvYQjogHwCfdpOL
-nWa5XX8Bbk97fic3LKE07xg=
-=lIkl
------END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
index 913d332dbb29..2a9862d3c936 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.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_p20050226-r1.ebuild,v 1.1 2005/03/09 22:39:19 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r1.ebuild,v 1.2 2005/03/11 06:47:57 lu_zero Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa"
-IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l pic"
+IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l pic xvid"
 
 DEPEND="imlib? (media-libs/imlib2)
 		truetype? (>=media-libs/freetype-2)
@@ -24,6 +24,7 @@ DEPEND="imlib? (media-libs/imlib2)
 					media-libs/libogg)
 		!alpha?( aac? (media-libs/faad2 media-libs/faac) )
 		dvd? (media-libs/a52dec)
+		xvid? (media-libs/xvid)
 		"
 
 src_unpack() {
@@ -94,6 +95,7 @@ src_compile() {
 	$(use_enable v4l) \
 	$(use_enable dv dv1394) \
 	$(use_enable threads pthreads) \
+	$(use_enable xvid) \
 	--enable-gpl \
 	--enable-shared-pp \
 	--enable-shared \