diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-02-08 14:05:32 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-02-08 14:05:32 +0000 |
| commit | a51e5e807eeaa3ac77bb12c702d0bc24ab90d284 (patch) | |
| tree | eb67275a9c1a52152376254b6fd4c3b275390fe6 /media-video/mplayer | |
| parent | disable libilbc for the same reason as libopus: it is for internal ffmpeg only. (diff) | |
| download | gentoo-2-a51e5e807eeaa3ac77bb12c702d0bc24ab90d284.tar.gz gentoo-2-a51e5e807eeaa3ac77bb12c702d0bc24ab90d284.tar.bz2 gentoo-2-a51e5e807eeaa3ac77bb12c702d0bc24ab90d284.zip | |
Merge all binary codec support under win32codecs useflag
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 28 |
2 files changed, 12 insertions, 21 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/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 |