diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-06-25 11:51:10 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-06-25 11:51:10 +0000 |
| commit | 93fff7e527cfbc4ac893c13c9add133087d69958 (patch) | |
| tree | a753661c2a091dd770200c28d2fb043da345ed90 /media-video/mplayer | |
| parent | Add proper kde_minimal. (diff) | |
| download | gentoo-2-93fff7e527cfbc4ac893c13c9add133087d69958.tar.gz gentoo-2-93fff7e527cfbc4ac893c13c9add133087d69958.tar.bz2 gentoo-2-93fff7e527cfbc4ac893c13c9add133087d69958.zip | |
disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 17c32d8ac998..7988161640ea 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # 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.748 2010/06/13 10:07:24 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.749 2010/06/25 11:51:10 aballier Exp $ + + 25 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + disable faac with use bindist, by Nikoli <nikoli@lavabit.com>, bug #323353 13 Jun 2010; Dror Levin <spatz@gentoo.org> mplayer-1.0_rc4_p20100612.ebuild: diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 7e4fd01b6cf4..3c0e8905f081 100644 --- 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.65 2010/06/12 18:14:40 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.66 2010/06/25 11:51:10 aballier Exp $ EAPI="2" @@ -107,7 +107,7 @@ RDEPEND+=" encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) - faac? ( media-libs/faac ) + faac? ( !bindist? ( media-libs/faac ) ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423 ) xvid? ( media-libs/xvid ) @@ -450,6 +450,11 @@ src_configure() { use ${i} || myconf+=" --disable-${i}" done use faac || myconf+=" --disable-faac-lavc" + if use bindist + then + use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support." + myconf+=" --disable-faac --disable-faac-lavc" + fi else myconf+=" --disable-mencoder" myconf+=" --disable-faac-lavc" |