diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-04-24 13:30:48 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-04-24 13:30:48 +0000 |
| commit | a331458663435722d3c9f868ed2a94fc82196f49 (patch) | |
| tree | f34e32e34fd15c6ec4ba0fc60e7beef297abbb34 /media-video | |
| parent | remove aac useflag: let faad and faac useflags handle it; otherwise there is ... (diff) | |
| download | gentoo-2-a331458663435722d3c9f868ed2a94fc82196f49.tar.gz gentoo-2-a331458663435722d3c9f868ed2a94fc82196f49.tar.bz2 gentoo-2-a331458663435722d3c9f868ed2a94fc82196f49.zip | |
dont depend on cdparanoia if cdio is enabled, we wont use it; patch by Andrew Savchenko, bug #299405
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 167b8e770528..36b786d15526 100644 --- 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.727 2010/04/24 13:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.728 2010/04/24 13:30:48 aballier Exp $ + + 24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: + dont depend on cdparanoia if cdio is enabled, we wont use it; patch by + Andrew Savchenko, bug #299405 24 Apr 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: remove aac useflag: let faad and faac useflags handle it; otherwise there diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 3253e5b8180c..c4b708cb6135 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.44 2010/04/24 13:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.45 2010/04/24 13:30:48 aballier Exp $ EAPI="2" @@ -96,7 +96,7 @@ RDEPEND+=" bidi? ( dev-libs/fribidi ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) - cdparanoia? ( media-sound/cdparanoia ) + cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dirac? ( media-video/dirac ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) |