From: Luca Barbato Date: Fri, 11 Jun 2010 11:34:50 +0000 (+0000) Subject: Update live ebuild X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5aec46880c6db9a43b005be5b0b13c63d33cb3e5;p=gentoo.git Update live ebuild Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index f869ca31a2c2..65d3c45f3eca 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.353 2010/06/06 23:11:12 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.354 2010/06/11 11:34:50 lu_zero Exp $ + + 11 Jun 2010; Luca Barbato metadata.xml, + ffmpeg-9999-r1.ebuild: + Update live ebuild, support libvpx, that should address the final bit of + bug #320817, thanks to Nikoli again for the support 06 Jun 2010; Luca Barbato metadata.xml, ffmpeg-9999-r1.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index f7d0e84a3a9c..59bd7e8281af 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -2,6 +2,6 @@ DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0 DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f4c34 SHA1 270130d83e1a5230102e2add113b9f3bbfe7a564 SHA256 81f73aa9857663d18734f0881bd5d8b648f9228dcec10a2dfb08bef262a1c1e9 EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d -EBUILD ffmpeg-9999-r1.ebuild 7629 RMD160 bb2c09db54e1eb591fa7f0af68141d374c353ab9 SHA1 9159948d06e627e874be412d11291a6d246d1486 SHA256 beeba980f00258b4ffde63ed84dfa6db03552767e0ff7436d11d8e35c39a1d8d -MISC ChangeLog 52940 RMD160 8b9ee4f0b90884b3ced371e9a8d7066ca7e03b80 SHA1 158c28a06b14447f37d58b6408cd020e0b9e5180 SHA256 5259d4ef66d05fe1bb3b691d95b0fe6d8d773212bbf4f508acdb4d2866042159 -MISC metadata.xml 1909 RMD160 6d89b0e84cf68375ee83639c9a5e5a92e3edfa88 SHA1 5e0378eed0a52291b84f197e7614d52b37a596ef SHA256 e79d46f9a837c3cfca5a27daef177ebe4020d3ebc83c339624cf665ed0087644 +EBUILD ffmpeg-9999-r1.ebuild 7695 RMD160 868e536bcd2e8806e13d1f3aa3ad96be119b627d SHA1 ce21fd9a8436d2abf781e3950876017ee117c344 SHA256 04a42f68d71e99ffeb7f436edbe9c20d5458e991a80698674317cd4a3cd61fa1 +MISC ChangeLog 53158 RMD160 b50e1c81016e3581c443df5cb1654cfa25b07568 SHA1 a29aab3bbe02527b4f142dbbf6fa1b8a22610d7c SHA256 52add3a3bf52d96bcfa2ac3772e0e3c201b62daf2bf564da339b9621fd526bcc +MISC metadata.xml 1973 RMD160 b94286038640659efda908f1141ebd49dd5fb19a SHA1 80ecb91c771d75606ba135b5f9447649461ca8c9 SHA256 831b6526385ea8e4877d47748f0a27e6983bb42ac879ed7a177104aec0189e95 diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 4e95eb2d441c..78da9551261d 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.35 2010/06/06 23:11:12 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.36 2010/06/11 11:34:50 lu_zero Exp $ EAPI=2 SCM="" @@ -29,7 +29,7 @@ IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 amr oss pic rtmp schroedinger +hardcoded-tables bindist v4l v4l2 - speex +ssse3 jpeg2k vaapi vdpau" + speex +ssse3 jpeg2k vaapi vdpau vpx" VIDEO_CARDS="nvidia" @@ -60,6 +60,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) jack? ( media-sound/jack-audio-connection-kit ) X? ( x11-libs/libX11 x11-libs/libXext ) vaapi? ( x11-libs/libva ) + vpx? ( media-libs/libvpx ) video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )" @@ -67,6 +68,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) DEPEND="${RDEPEND} >=sys-devel/make-3.81 dirac? ( dev-util/pkgconfig ) + rtmp? ( dev-util/pkgconfig ) schroedinger? ( dev-util/pkgconfig ) mmx? ( dev-lang/yasm ) doc? ( app-text/texi2html ) @@ -133,7 +135,7 @@ src_configure() { # Decoders use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" - for i in gsm faad dirac rtmp schroedinger speex; do + for i in gsm faad dirac rtmp schroedinger speex vpx; do use $i && myconf="${myconf} --enable-lib$i" done use jpeg2k && myconf="${myconf} --enable-libopenjpeg" diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml index 217ae87af676..8e4dbae27162 100644 --- a/media-video/ffmpeg/metadata.xml +++ b/media-video/ffmpeg/metadata.xml @@ -25,5 +25,6 @@ faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips) Enables VAAPI (Video Acceleration API) for hardware decoding Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card + Enables vp8 codec support using libvpx