diff options
author | Alastair Tse <liquidx@gentoo.org> | 2003-07-14 13:09:41 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2003-07-14 13:09:41 +0000 |
commit | a2c044dc6dc5286ef2d1e8e861a551313ac7221d (patch) | |
tree | f98112367264035c6a9e726566561eb3d7704e8f /media-video | |
parent | update 2.5 patches; fixup highpmd stuff (diff) | |
download | gentoo-2-a2c044dc6dc5286ef2d1e8e861a551313ac7221d.tar.gz gentoo-2-a2c044dc6dc5286ef2d1e8e861a551313ac7221d.tar.bz2 gentoo-2-a2c044dc6dc5286ef2d1e8e861a551313ac7221d.zip |
prevent depending on a masked imlib
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 1560709958b4..90625de33b4b 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.19 2003/07/14 00:47:29 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.20 2003/07/14 13:09:33 liquidx Exp $ + + 14 Jul 2003; Alastair Tse <liquidx@gentoo.org> + ffmpeg-0.4.7_pre20030624.ebuild: + depend on a non-masked version of imlib2 13 Jul 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild: Adding sdl, imlib, and truetype use flags. diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 1c31d42f1c78..7618ca00ef49 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,11 +1,11 @@ +MD5 ab315a6215863172ed732a9b34e1606c ChangeLog 3540 +MD5 2d75291c4685dc1a93c5e91901df57c0 ffmpeg-0.4.5.ebuild 693 +MD5 6c484228a17602440a3c7967e3eabd33 ffmpeg-0.4.6-r1.ebuild 1561 +MD5 afaf74cb5011c84394bd0e9b0d5629a5 ffmpeg-0.4.6.ebuild 1523 +MD5 c1f6ac23481157cace72cb80a0797e67 ffmpeg-0.4.7_pre20030624.ebuild 2205 MD5 57e0978ef4a4ff1662572740a8d94ed7 files/digest-ffmpeg-0.4.5 64 MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6 64 MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6-r1 64 MD5 30ba42e8d259ef5fe8c439670f685c1f files/ffmpeg-0.4.6-Makefiles.diff 3429 MD5 f139809ab74138dbf8f24bc4f89edbd8 files/digest-ffmpeg-0.4.7_pre20030624 74 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777 -MD5 2d75291c4685dc1a93c5e91901df57c0 ffmpeg-0.4.5.ebuild 693 -MD5 6c484228a17602440a3c7967e3eabd33 ffmpeg-0.4.6-r1.ebuild 1561 -MD5 f25e86f18c90204cd2da37a3c131b829 ffmpeg-0.4.6.ebuild 1526 -MD5 f47a008b3d34640e8ac4c3a2c07289a9 ChangeLog 3284 -MD5 d564704486261cbf36556f809cd25443 ffmpeg-0.4.7_pre20030624.ebuild 2009 diff --git a/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild index e941bb49e44f..71ad6f6609d6 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild,v 1.4 2003/07/14 00:47:30 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild,v 1.5 2003/07/14 13:09:33 liquidx Exp $ inherit eutils @@ -25,7 +25,7 @@ DEPEND="encode? ( >=media-sound/lame-3.92 ) faad? ( >=media-libs/faad2-1.1 ) dvd? ( >=media-libs/a52dec-0.7.4 ) sdl? ( >=media-libs/libsdl-1.2.5 ) - imlib? ( >=media-libs/imlib2-1.0.7 ) + imlib? ( >=media-libs/imlib2-1.0.6 ) truetype? ( >=media-libs/freetype-2.1.2 )" S=${WORKDIR}/ffmpeg-cvs-2003-06-24 |