diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-07-27 06:56:35 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-07-27 06:56:35 +0000 |
| commit | 0d57064fe894a215d742962836fe82396c1f241f (patch) | |
| tree | 567d4616d23218dd9d7b36dd8ad986ade3ed6b46 /media-video | |
| parent | Add missing dependency on dev-python/setuptools for bug #278980 (diff) | |
| download | gentoo-2-0d57064fe894a215d742962836fe82396c1f241f.tar.gz gentoo-2-0d57064fe894a215d742962836fe82396c1f241f.tar.bz2 gentoo-2-0d57064fe894a215d742962836fe82396c1f241f.zip | |
Add an option to link against system shared ffmpeg instead of building its own copy and statically linking to it. Saves around 40Mb here but is discouraged by upstream.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/mplayer/metadata.xml | 1 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 15 |
3 files changed, 19 insertions, 5 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 4eee8a1cd322..c7fc37812e5f 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.653 2009/07/26 10:48:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.654 2009/07/27 06:56:35 aballier Exp $ + + 27 Jul 2009; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild, + metadata.xml: + Add an option to link against system shared ffmpeg instead of building its + own copy and statically linking to it. Saves around 40Mb here but is + discouraged by upstream. 26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> mplayer-1.0_rc2_p20090530.ebuild, mplayer-9999.ebuild: diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index c98e053535a3..8e2a9015cfec 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -18,6 +18,7 @@ <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag> <flag name="dxr3">Enable DXR3/H+ video output</flag> <flag name="enca">Enables support for charset discovery and conversion</flag> + <flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag> <flag name="faac">Use external faac library for AAC encoding</flag> <flag name="faad">Use external faad library for AAC decoding</flag> <flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag> diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index a0ea37cf8b5c..598f7ebaf4bb 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-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/mplayer/mplayer-9999.ebuild,v 1.10 2009/07/26 10:48:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.11 2009/07/27 06:56:35 aballier Exp $ EAPI="2" @@ -14,9 +14,9 @@ inherit eutils flag-o-matic multilib ${SVN_ECLASS} IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3 -+enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack -joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx -mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu ++enca +encode esd external-ffmpeg +faac +faad fbcon ftp gif ggi -gmplayer +iconv +ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum ++mmx mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim @@ -87,6 +87,7 @@ RDEPEND="sys-libs/ncurses ) esd? ( media-sound/esound ) enca? ( app-i18n/enca ) + external-ffmpeg? ( media-video/ffmpeg ) faad? ( !aac? ( media-libs/faad2 ) ) gif? ( media-libs/giflib ) ggi? ( @@ -545,6 +546,12 @@ src_configure() { unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS YASMFLAGS fi + ################# + # External FFmpeg # + ################# + + use external-ffmpeg && myconf="${myconf} --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a" + myconf="--cc=$(tc-getCC) \ --host-cc=$(tc-getBUILD_CC) \ --prefix=/usr \ |