diff options
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index efcd5ea9e1c1..c6fd9eff844c 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.260 2009/01/25 21:09:16 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.261 2009/01/27 07:41:19 aballier Exp $ + + 27 Jan 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + Add alsa/oss/3dnow useflags and disable servertest as its mainly broken 25 Jan 2009; Markus Meier <maekke@gentoo.org> ffmpeg-0.4.9_p20081219.ebuild: diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index fcbf9ab56ef7..f505b64e13fb 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.6 2009/01/20 19:44:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.7 2009/01/27 07:41:18 aballier Exp $ ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk" @@ -13,12 +13,13 @@ HOMEPAGE="http://ffmpeg.org/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="aac altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis - test theora threads x264 xvid network zlib sdl X mp3 schroedinger +IUSE="3dnow aac alsa altivec amr debug dirac doc ieee1394 encode gsm ipv6 mmx mmxext vorbis + test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger hardcoded-tables bindist v4l v4l2 speex ssse3 vhook" RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 ) sdl? ( >=media-libs/libsdl-1.2.10 ) + alsa? ( media-libs/alsa-lib ) encode? ( aac? ( media-libs/faac ) mp3? ( media-sound/lame ) @@ -79,9 +80,14 @@ src_compile() { # libavdevice options use ieee1394 && myconf="${myconf} --enable-libdc1394" - for i in v4l v4l2 ; do + # Demuxers + for i in v4l v4l2 alsa oss ; do use $i || myconf="${myconf} --disable-demuxer=$i" done + # Muxers + for i in alsa oss ; do + use $i || myconf="${myconf} --disable-muxer=$i" + done use X && myconf="${myconf} --enable-x11grab" # Threads; we only support pthread for now but ffmpeg supports more @@ -111,6 +117,7 @@ src_compile() { use $i || myconf="${myconf} --disable-$i" done use mmxext || myconf="${myconf} --disable-mmx2" + use 3dnow || myconf="${myconf} --disable-amd3dnow" # disable mmx accelerated code if PIC is required # as the provided asm decidedly is not PIC. if gcc-specs-pie ; then @@ -183,7 +190,7 @@ src_install() { # Never die for now... src_test() { - for t in codectest libavtest servertest seektest ; do + for t in codectest libavtest seektest ; do emake ${t} || ewarn "Some tests in ${t} failed" done } |