Add vpx support via media-libs/libvpx.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index b1c02e32094b9dee7919ee5ce78273885a04d797..095676dd1c55f07f90e06bdf9babc725179bb0d3 100644 (file)
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.745 2010/06/11 13:59:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.746 2010/06/12 18:14:40 spatz Exp $
+
+  12 Jun 2010; Dror Levin <spatz@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Add vpx support via media-libs/libvpx.
 
   11 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix the configure options building with mencoder disabled, bug #323097

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index f1e90d558232b112af9cf4e3838b3916cbc5d7ff..94383fe92821684a8ce234f26d2b6442fba4b2e5 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX mplayer-1.0_rc4_p20091026-arm_neon.patch 591 RMD160 339c545419fd815a4b2aa1db9214620ce1b90f85 SHA1 219300d43e567fb3a0df9388798015bef09ddc01 SHA256 71d95820bc0d61a16469e42fa2fe42d4c46ca5339876f926259ed390cbbc899c
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
@@ -11,13 +11,17 @@ DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20207 RMD160 1eb6056f90a443eaca390be0b38f7174ed9137b0 SHA1 e599d0d08f1789dfdcbd6b2b0f694ab14670404d SHA256 7d0a6d38e771f3dd58b93269f6b305712362339afd49ae25a0efbac61e53146e
-EBUILD mplayer-9999.ebuild 20100 RMD160 1b513a68246c6aa1cf68d04ce8baa6b0b8e72763 SHA1 0681d4c14c5ac9b8a6e51a739d992cae524c1683 SHA256 6f38052be4f8bcb6099b385c6723162190e76edf9192b2dcb9c55d030f47b7ee
-MISC ChangeLog 131502 RMD160 725d2955885b4065d52f1ba7ad2f63bbd0a229b9 SHA1 165fdf685954ea7abbd06670fdae326cb84d4b54 SHA256 7723ef97563b463d6febe1d131790da3281f917aa0715d090e4c1cc0a7660d10
-MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e
+EBUILD mplayer-9999.ebuild 20174 RMD160 55c5bcd0effcede1a4d37aa5843be4444bfd80af SHA1 b0ca95dd02fa3f600b915ffe9fa86216f5f87432 SHA256 2240e8d39a6901f361a32f1b4ef1f651eb56e891b55563012a67a9c158f1fc6f
+MISC ChangeLog 131623 RMD160 99ce8d1d166c997cda95e188a0c102f7a55aea84 SHA1 884e26817c314876f8817e426b2de00a0959d4bc SHA256 b217c72b40e11700b0e18cbc1ef6e2cf8b63b7380115648d73964589272bda41
+MISC metadata.xml 3650 RMD160 c3598892a1a7d707670114f5308ba6e0b9099de4 SHA1 e6a81d9be804eb7998c5986c989fdf4af3456be5 SHA256 918d8349f1b79921e6640d28de306ee6f930d95aca93f88f8686dee8d4722967
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwSQVsACgkQvFcC4BYPU0ogFACeLRY5Kg+itgdIKKHp/fY2CmdD
-WuAAnRGIrQ/eVRUogZ/cG9FdFrkmQqWq
-=o8qG
+iQEcBAEBCgAGBQJME86ZAAoJEAWF714uGAc6IxsH/2vR8T3V+qKcTBE9+JKtrR6m
+qDWLUL3d9uj5N0PWUmuMZUgwPRY8NVlWReVyr2CeoHT0jxrLM6GngZNgDaQRMyML
+swI/p+hTSrNOHll7hpFTx1sjNV1jDch4A7n2CPleQ/7DvoLm8uAOTX7Xhj/ZEr0a
+ihIt2fuOYg3Vywp3MjJ7XGItz2HctFFahF2Wmw/fjInNayynfyYbiK6LBzBUhbtJ
+dvDegRqSETzVqDCaZ8cr/G6jKbn8XdhUEXLKzoLYSu0Lg3UTFtIlxitcGKT7Rxol
+Gnx52oQ8DjE97zPsxkMdsmBYTV+re0miwyrfTRcp5Qes9P9vjgZBgu2cG2+yBDg=
+=4NhU
 -----END PGP SIGNATURE-----

diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 7629745420ad77e2c5a44c9958b631e652359a3e..9ad2fa76c2853c055d1e4171103f0933936e9c74 100644 (file)
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -44,6 +44,7 @@
        <flag name="tremor">Enable internal support for Vorbis</flag>
        <flag name="twolame">Enable twolame MPEG-2 encoding</flag>
     <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag>
+       <flag name="vpx">Enables vp8 codec support using libvpx</flag>
     <flag name="vidix">Support for vidix video output</flag>
     <flag name="xanim">Enables support for xanim based codecs</flag>
     <flag name="xvmc">Enables X-Video Motion Compensation support</flag>

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 9bdf84e38994e3478577ee0433b1c5ac2af1997f..7e4fd01b6cf40f5a9b83ba4c3ef4c485603e1d99 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.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/mplayer/mplayer-9999.ebuild,v 1.64 2010/06/11 13:59:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.65 2010/06/12 18:14:40 spatz Exp $
 
 EAPI="2"
 
@@ -18,8 +18,8 @@ gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
-+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis win32codecs
-+X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
++truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
+win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -147,6 +147,7 @@ RDEPEND+="
        theora? ( media-libs/libtheora[encode?] )
        truetype? ( ${FONT_RDEPS} )
        vorbis? ( media-libs/libvorbis )
+       vpx? ( media-libs/libvpx )
        xanim? ( media-video/xanim )
 "
 
@@ -441,6 +442,7 @@ src_configure() {
                        --disable-libvorbis
                "
        fi
+       use vpx || myconf+=" --disable-libvpx-lavc"
        # Encoding
        uses="faac x264 xvid toolame twolame"
        if use encode; then