diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-02-08 14:05:40 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-02-08 14:05:40 +0000 |
| commit | 214d69098dab08e3a497806da44f55a2e31ecd2a (patch) | |
| tree | fdeb3757a7326776b29afeaa96cddc754f624665 /media-video | |
| parent | disable libilbc for the same reason as libopus: it is for internal ffmpeg only. (diff) | |
| download | historical-214d69098dab08e3a497806da44f55a2e31ecd2a.tar.gz historical-214d69098dab08e3a497806da44f55a2e31ecd2a.tar.bz2 historical-214d69098dab08e3a497806da44f55a2e31ecd2a.zip | |
Merge all binary codec support under win32codecs useflag
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 10 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 28 |
3 files changed, 17 insertions, 26 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 3579e8452c54..f78eca94fcd4 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.880 2013/02/08 13:50:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.881 2013/02/08 14:05:32 aballier Exp $ + + 08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + Merge all binary codec support under win32codecs useflag 08 Feb 2013; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: disable libilbc for the same reason as libopus: it is for internal ffmpeg diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index aeb2929f7004..65c811165be4 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -15,14 +15,14 @@ DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919 DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee EBUILD mplayer-1.1-r1.ebuild 18485 SHA256 171063395cf497821e727735f5f4183c0483224b9fb29c160ad690f70f14ef23 SHA512 a276477d5edf7ad7455b9806b406cfe2fd8a3e9656e24ef61f01603dfce83463e2eed32d7d308cafbcd8c108c2bc679901482b18e5772c47ae539497e9477a08 WHIRLPOOL 5a6b86caac2c13ff71ed18b89c516c6fc1035ce403dcd57e23fdf89aa55acbbf14f2402df82116a1d6f791852fe53f5c49c61ac6f1f5c51a66e70fda74ae5455 -EBUILD mplayer-9999.ebuild 17393 SHA256 1ad1589496bdf3ea42fa63968b5fc255065f112c2347574ceb165a8041e03ecc SHA512 b99eb2436e8faeaad82a8855dc7936ea9174077370eaa60da76fb8866d6939b70c3a266396d9b0db3a1aa1fff8d6219f75115958083eb5d7f59d189888fc1c15 WHIRLPOOL 7698ec919b97bcf3715be1e1d96e2308e25898cf781e7d7f988a5fd264e65753367c3b7ab1ceb807e68664d3a27b7dfb1f5bcf1dfaba8188491192fa3f59a6df -MISC ChangeLog 46593 SHA256 387ffbd6387b36023f2b860ccce1b03762c0dc8b2005e958118897668dfc89df SHA512 030d63b5d05760ac5392edd561bfb5b98e7a9dade71ee1bc954d55b686984c02bd4736997bdf219b4ccfda63a7a6270481ab65b41f93f90e7817840349569ded WHIRLPOOL 6f759aea8218588228ad68b7029ffae7ea78f6de0044e2774c9680ee7cd730767a49e95dd6feace6cfb4dc521143c73398b3f675cdbab4ed91d057d8ceefb10d +EBUILD mplayer-9999.ebuild 17077 SHA256 04b94fb1ec4f7d2be3fc22c834221d8b672e2999f5700b1af592608bf461f7bf SHA512 e624cdfa98d6d47eee4ae2396910c697c108b462d29986be52a40c872944db36e11b580acd34dec95a91aadcf390ed63977eff7407cdbfcf904856c312fdc919 WHIRLPOOL 7572f97904c87eb24fb433a2fc5ab18bdf2b259edb876bdaaa7922d94fde47e12184eadeeae376af799a651dbff4339c94fd08a58bef02d20131ebba448fcaec +MISC ChangeLog 46726 SHA256 c1755c4b0a4ddc1fd7a12e6185f39c0a0287f98bd3abf5fd1a97c2be82c77e90 SHA512 1ec5007dad1b9b30d10434d318eaf16d4c08c60aacf390fda85048422f321ef87e70248afdb1febdb45122aed837ee9ddea073935273d1a42a256c8945c01aa6 WHIRLPOOL a3787212809943fab7c05549d17a9c998712d7fd2391831c58e84e6f996ac26c52493fb2434349ca583bf418717651314df0beec70f012556b88166b4a727c3f MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74 MISC metadata.xml 2817 SHA256 02dd96afd2d4b87856cc7757069d4aeb17a03be8e04fbb36cb273519a854ae74 SHA512 648468880abae503c37efc5bc07390e343d80b967ae17019a1f6829e10e3268f4f5b8256aa0320ba25f7934e1eee39b33d6ab88d9bf5fa3802ff5b98788b1ba5 WHIRLPOOL 9961358cfa55c13452a93a487aa7884c910f8e9517439c0648f83f7cf1fad539b42babb14bca71e35d97c4d36cc9a7b2b70d06a7b14c1948eac2244dc8438e22 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEVApwACgkQvFcC4BYPU0qRlwCgi2WtFF/qYE57wImT50CqbW9e -/yQAnjhTud4zAi/7CsE6Nstm8+4cc9so -=v+g/ +iEYEAREIAAYFAlEVBi4ACgkQvFcC4BYPU0quIQCffWm7/v7cmwUNDDg0s/osIfFL +xLMAnRLYdzhE6XIqQtfIGxvbi+PXupb4 +=sXDt -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 2e69278bd6c4..0a1ed272a849 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.138 2013/02/08 13:50:18 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.139 2013/02/08 14:05:32 aballier Exp $ EAPI=4 @@ -15,8 +15,8 @@ bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa +libass libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas -+network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime -radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 ++network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +radio +rar +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora tremor +truetype +toolame +twolame +unicode v4l vdpau vidix +vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" @@ -407,24 +407,12 @@ src_configure() { ################# # Binary codecs # ################# - # bug 213836 - if ! use x86 || ! use win32codecs; then - use quicktime || myconf+=" --disable-qtx" + if use win32codecs ; then + myconf+=" --enable-win32dll" + else + myconf+=" --disable-qtx --disable-real --disable-win32dll" fi - ###################### - # RealPlayer support # - ###################### - # Realplayer support shows up in four places: - # - libavcodec (internal) - # - win32codecs - # - realcodecs (win32codecs libs) - # - realcodecs (realplayer libs) - - # internal - use real || myconf+=" --disable-real" - myconf+=" $(use_enable win32codecs win32dll)" - ################ # Video Output # ################ @@ -568,7 +556,7 @@ src_install() { dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} docinto TOOLS/ dodoc -r TOOLS - if use real; then + if use win32codecs; then docinto tech/realcodecs/ dodoc DOCS/tech/realcodecs/* fi |