diff options
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index c19ec1e1cef8..f8bba5c7f50d 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.582 2012/09/29 02:16:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.583 2012/09/29 15:17:30 aballier Exp $ + + 29 Sep 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + tests now work without zlib *ffmpeg-1.0 (29 Sep 2012) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 148a6967c003..f6372998dc5c 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.105 2012/09/29 02:08:58 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.106 2012/09/29 15:17:30 aballier Exp $ EAPI="4" @@ -118,7 +118,7 @@ DEPEND="${RDEPEND} REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) - test? ( encode zlib )" + test? ( encode )" S=${WORKDIR}/${P/_/-} |