summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-01-27 07:41:19 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-01-27 07:41:19 +0000
commit9d4cdb658bcb20f2245a5a2aaf4912d25aeaadc6 (patch)
tree052ecd4f408fc1d9f7357c330cd7266adb37e045 /media-video/ffmpeg
parentAutomated update of use.local.desc (diff)
downloadhistorical-9d4cdb658bcb20f2245a5a2aaf4912d25aeaadc6.tar.gz
historical-9d4cdb658bcb20f2245a5a2aaf4912d25aeaadc6.tar.bz2
historical-9d4cdb658bcb20f2245a5a2aaf4912d25aeaadc6.zip
Add alsa/oss/3dnow useflags and disable servertest as its mainly broken
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild17
3 files changed, 21 insertions, 11 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/Manifest b/media-video/ffmpeg/Manifest
index fffa1f18a242..cc634676ea65 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,13 +9,13 @@ DIST ffmpeg-0.4.9-p20090121.tar.bz2 2692413 RMD160 5dabe8aaa191d4a2bdd57e1aea8c1
EBUILD ffmpeg-0.4.9_p20081014.ebuild 6400 RMD160 ece41c320da3ab98bbd93dcab604c67e2e31aea5 SHA1 e8517457d731a9821efd87930782e8ca38aa6133 SHA256 0e3119b7f1a8edf9b7fd544708989f7438431652a81f0ed5b087f3fc5368f9e6
EBUILD ffmpeg-0.4.9_p20081219.ebuild 6145 RMD160 bff8e8b10cb27454a4e31430bc4a9d01191a1a38 SHA1 708d5b004ee1caac8a012a95a79d7c3ffb9bb853 SHA256 edbd4b878bf89dc4a7dd4914c27cc8bfdc6a94773e3469f68f57452e88ac6bd4
EBUILD ffmpeg-0.4.9_p20090121.ebuild 6151 RMD160 af9848d2992e88c99a9b907542e95c5ee571f638 SHA1 b3f5d2e73a78f6c647e9096d8d3c7c23eb95fff2 SHA256 2ca908b5a71741b347aea0e7c44f74e24356b691f3c13705ff957580d3230c37
-EBUILD ffmpeg-9999.ebuild 5991 RMD160 f9ee3bc7a6923ebbaddee2edf92ae30e82aa0ef3 SHA1 b065cbf53c41ce78b6f72e4076331e287336effc SHA256 0269739f9a81594fd8ec422c1a78a55a62430203307b1722022ed5e820f5eaaa
-MISC ChangeLog 39610 RMD160 dc0520742036999b3bc6bae1ea9f739a7e015fc1 SHA1 59ee627a64ab04de35fe02aa0497c1f0f4811890 SHA256 eb6399fcd40f4497c8b11c042c3a4c0d572b07257519d743443bb8ac35feeb97
+EBUILD ffmpeg-9999.ebuild 6189 RMD160 5d0bf4a1c3a1bfbca289de3b49c6711774d0027d SHA1 e0e56b051b90be84f3b2c31cb2f46674e7510279 SHA256 911394001c66dfd7de98bae0627dbdf3b5301c85bd59b4e6d22bf3ff9d70262d
+MISC ChangeLog 39759 RMD160 dbe4a98b4908920c802f95ea4459a5a886a22a94 SHA1 94849798a45b370903b50b3890131c49e8b4ec5b SHA256 ca2c50cb32347829880b8c140b03bfef076aff163144804ecc640c915fa8df66
MISC metadata.xml 1158 RMD160 f666c9d210c950f862cbf0fcc323a7085f5febe7 SHA1 e5c84b8a4916b9bb20960ae16345c6d0844baa81 SHA256 ab916e46e6a91bf195e25dfe23c777436744017dfdb96d3330fd633bec599e2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkl81REACgkQkKaRLQcq0GJHLwCggAv5tF9QgV40WD5VP9c+LJnS
-uZIAoKEmKDjVBGuv/PULOsQM8GC9H8Vd
-=3+Ac
+iEYEARECAAYFAkl+uqQACgkQvFcC4BYPU0pgGwCeP0bXA2oG5rmfQFR0jmhY00im
+MJwAoLqYA96YeTCn5HM2gzRW/6psP9Tw
+=Sae3
-----END PGP SIGNATURE-----
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
}