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 | 19dce343386a2f2d5f22924809da4a41525304d7 (patch) | |
| tree | 097151d4248fc173ce0c60d6a72be3c950d52fc8 /media-video/mplayer | |
| parent | remove aac useflag: let faad and faac useflags handle it; otherwise there is ... (diff) | |
| download | historical-19dce343386a2f2d5f22924809da4a41525304d7.tar.gz historical-19dce343386a2f2d5f22924809da4a41525304d7.tar.bz2 historical-19dce343386a2f2d5f22924809da4a41525304d7.zip | |
dont depend on cdparanoia if cdio is enabled, we wont use it; patch by Andrew Savchenko, bug #299405
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 10 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 4 |
3 files changed, 12 insertions, 8 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/Manifest b/media-video/mplayer/Manifest index dcc74cac5f7d..ea834ee86fe2 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -15,13 +15,13 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070 EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8 -EBUILD mplayer-9999.ebuild 19976 RMD160 a7d01780fe3f311f1171f64065bab72231df7f83 SHA1 08e26b7199781d1ec6969c171ed2a7cc03f77a68 SHA256 06969a2d2097d7e3e8267d3de07ac1d1d1fbb6a4f66d72cf67f2caa7e99796a2 -MISC ChangeLog 128523 RMD160 5d4052c0507b13edbbb1027d10848edd34eeac1c SHA1 f9d458eca95b4d6822348757df02bf21fb7ed70f SHA256 d66df831f4240f9efd2f8853718df760260073ac63af78313dc49ed4bc8c41ac +EBUILD mplayer-9999.ebuild 19987 RMD160 57d613e208e816929dc2a605c595a6d3ef5aa904 SHA1 e97ff1b515240881c610c85ca5dd311f36ad7aba SHA256 1eac50c316e1fe381829f44dee8a8e54951231b29b3d224242984da05f586b6b +MISC ChangeLog 128702 RMD160 d1e0950525848f9f5a1ca0894a55adbd2be092ad SHA1 d53507d4240866cff3688a24c6caf0cc5171e800 SHA256 f38f610b790e03d8eb67315b7c2038509f73731a2d3971dd5f4b8e047e3b3de0 MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvS8RYACgkQvFcC4BYPU0rvHACgpHvIzeMWBIjTp9yccJ/Tauek -6J0An3YFniwAWtZ16NJ3KIGLkgSo2VaC -=A4zx +iEYEARECAAYFAkvS8o4ACgkQvFcC4BYPU0rDswCgg+fasPSHEAKBjIKGfxQJg3DN +UaEAoKXOiWsLzcRQUZX/XPSQaq36124c +=jjV/ -----END PGP SIGNATURE----- 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 ) |