summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-03-20 09:42:57 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-03-20 09:42:57 +0000
commit0651ad942568913d25fd9e0f33bf057935e5eb9a (patch)
treea9c8f0ce2a62fe3a0071e68696133b7661e7e92c /media-video
parentCommit missing patches, bug #408935 by rainbow. (diff)
downloadgentoo-2-0651ad942568913d25fd9e0f33bf057935e5eb9a.tar.gz
gentoo-2-0651ad942568913d25fd9e0f33bf057935e5eb9a.tar.bz2
gentoo-2-0651ad942568913d25fd9e0f33bf057935e5eb9a.zip
cws2fws requires zlib
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 77afd4a84dbd..9769b64378f0 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.529 2012/03/18 13:54:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.530 2012/03/20 09:42:57 aballier Exp $
+
+ 20 Mar 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ cws2fws requires zlib
*ffmpeg-0.10.2 (18 Mar 2012)
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 8aeb89cb058a..52b118b6cb27 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.81 2012/03/13 23:17:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.82 2012/03/20 09:42:57 aballier Exp $
EAPI="4"
@@ -110,6 +110,7 @@ DEPEND="${RDEPEND}
# faac is license-incompatible with ffmpeg
REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
libv4l? ( v4l )
+ cws2fws? ( zlib )
test? ( encode zlib )"
S=${WORKDIR}/${P/_/-}