diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2006-03-06 21:50:54 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2006-03-06 21:50:54 +0000 |
| commit | b25d7fca15bef8826282f1016b3ebbc34be9cd0b (patch) | |
| tree | 0e646433de190131f7e79a693c2ede29089386ed /media-video/ffmpeg | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b25d7fca15bef8826282f1016b3ebbc34be9cd0b.tar.gz gentoo-2-b25d7fca15bef8826282f1016b3ebbc34be9cd0b.tar.bz2 gentoo-2-b25d7fca15bef8826282f1016b3ebbc34be9cd0b.zip | |
merged v4l and v4l2
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index aa6c1adcd73a..a3b2aed78ded 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.129 2006/03/05 00:24:52 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.130 2006/03/06 21:50:54 lu_zero Exp $ + + 06 Mar 2006; Luca Barbato <lu_zero@gentoo.org> + ffmpeg-0.4.9_p20060302.ebuild: + merged v4l and v4l2 05 Mar 2006; Luca Barbato <lu_zero@gentoo.org> ffmpeg-0.4.9_p20060302.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild index 4a3282b5909b..d9a42b9cae48 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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_p20060302.ebuild,v 1.6 2006/03/05 17:20:29 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060302.ebuild,v 1.7 2006/03/06 21:50:54 lu_zero Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -23,7 +23,7 @@ SLOT="0" #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss - test theora threads truetype v4l v4l2 x264 xvid dts network zlib sdl" + test theora threads truetype v4l x264 xvid dts network zlib sdl" DEPEND="imlib? ( media-libs/imlib2 ) truetype? ( >=media-libs/freetype-2 ) @@ -114,8 +114,7 @@ src_compile() { use altivec || myconf="${myconf} --disable-altivec" use debug || myconf="${myconf} --disable-debug" use oss || myconf="${myconf} --disable-audio-oss" - use v4l || myconf="${myconf} --disable-v4l" - use v4l2 || myconf="${myconf} --disable-v4l2" + use v4l || myconf="${myconf} --disable-v4l --disable-v4l2" use ieee1394 || myconf="${myconf} --disable-dv1394" use network || myconf="${myconf} --disable-network" use zlib || myconf="${myconf} --disable-zlib" |