From: Fabio Erculiani Date: Mon, 15 Mar 2010 15:05:45 +0000 (+0000) Subject: there is no need to depend against x11-drivers/nvidia-drivers for USE="vdpau", x11... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b717a270072b58fd5cb15079e0db0bbb0e7b3b43;p=gentoo.git there is no need to depend against x11-drivers/nvidia-drivers for USE="vdpau", x11-libs/libvdpau is enough Package-Manager: portage-2.2_rc64/cvs/Linux x86_64 --- diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index ed35c28f83ab..3771b3884d2a 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # 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.715 2010/03/09 14:25:37 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.716 2010/03/15 15:05:45 lxnay Exp $ + + 15 Mar 2010; Fabio Erculiani + mplayer-1.0_rc4_p20100213-r1.ebuild, mplayer-9999.ebuild: + there is no need to depend against x11-drivers/nvidia-drivers for + USE="vdpau", x11-libs/libvdpau is enough 09 Mar 2010; Steve Dibb mplayer-9999.ebuild: Drop dvbhead argument, bug 307951 diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 3f9d1ed4f546..03ddb040988f 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847 AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7 AUX mplayer-1.0_rc2_p20090731-linguas.patch 699 RMD160 eccde57fe14b664e962ca5c997fa6b72ebadc763 SHA1 0f036a975250a7ef6429f9c6dce036453c3a1d25 SHA256 c0939c548249afbc45905570c99bb6593175ebaf6e34bfceda284253600d9d22 @@ -14,14 +11,7 @@ DIST mplayer-1.0_rc4_p20091026.tbz2 15508762 RMD160 f4a6b4253cfbea8d3f7d6e1ac1c5 DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484598956db983 SHA1 350d39f2b42f5c5065abe7d64a4d759a9efa56f4 SHA256 59c09f6388ad15d12f74ae18ebe07945392e40d9096d5598bd496f857722bcb0 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 19012 RMD160 1076a93d98415f9a0c485d7a657ab880826a31b5 SHA1 0a864159b27bac92b50729eed004cc1f767a8593 SHA256 6267e447602f2323c11e91f9c702012616b5794d178ecae2f5522348161506cb -EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 20001 RMD160 c1130eb9f758599dfdad0732e9f59ef92b4cba51 SHA1 50d08fc82c9701f3ec161610f5f979c240e73e83 SHA256 282c2f3507d763106375f2e80246cb457e6261399469bce354b51001341659d1 -EBUILD mplayer-9999.ebuild 19966 RMD160 575fc1b727ced1d2882c9ff673713e310b2becc2 SHA1 5039218211c7867aec209ef6a299ed17fcfdd7ff SHA256 c0adf0172372fb5d0865a787bf136baf9c0bd117641a8a975e69aa4bdd51460f -MISC ChangeLog 126427 RMD160 a32eb5533eebd1231e42bf9802d404b11fcf36f2 SHA1 698463e53a6ad58bd7a5a31b91242d1b29be71dc SHA256 49c21c3704f97a3a23025aad9e65c2b6f54a767ee2d08283377f989f22177058 +EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19924 RMD160 b67f5abd12a40449118f655403eabfab92158d43 SHA1 0153c680f0e8b148d5274b0fd0638a62bde18759 SHA256 db7f0dbf7f5ec4e6967d48dea31f66cea080a2fcd727cbf779ac5c6d04c33d72 +EBUILD mplayer-9999.ebuild 19891 RMD160 ee0b310156a0538f99e35503755d649edc27bb47 SHA1 8c5a47d7ab1a1b8d310bc736fee2e719e0e46462 SHA256 17d54cf97fa499b5774d09f563522774aba1c5fe4fc2c7f1f86339659c7e0553 +MISC ChangeLog 126647 RMD160 7f49d4b73f00c3f335ee614a3389eb8f124514ba SHA1 74eaea6ee898d0829ae0e9b1b3c5f1fd0edd2ff4 SHA256 ab5fb1f0e4c381859afe557a83edcbbca9faf0da3b95ee0206c21dfdfd018d82 MISC metadata.xml 3592 RMD160 283728925342ad60ab657686a28c4b23498be4d8 SHA1 83077e1c109828be3970cf9faa24dde8a1434ad2 SHA256 f03e536b7c341c873dbf18fb23a29e648a80f07cf26f68246acf2664923f6df1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuZa2MACgkQdz7hIScOURFSdwCdG1RP6IPW0z9/GU1SLG6QeTnV -eLgAoOioiXF/cUAvW6EODCe0FZ/Y5eOb -=5hzJ ------END PGP SIGNATURE----- diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild index 957ce1c8082f..93ac8ba4ba60 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.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-1.0_rc4_p20100213-r1.ebuild,v 1.3 2010/03/02 22:26:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild,v 1.4 2010/03/15 15:05:45 lxnay Exp $ EAPI="2" @@ -84,9 +84,7 @@ RDEPEND+=" ) opengl? ( virtual/opengl ) truetype? ( ${FONT_RDEPS} ) - video_cards_nvidia? ( - vdpau? ( >=x11-drivers/nvidia-drivers-180.60 ) - ) + vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( @@ -580,7 +578,7 @@ src_configure() { use dga || myconf+=" --disable-dga1 --disable-dga2" use opengl || myconf+=" --disable-gl" use osdmenu && myconf+=" --enable-menu" - use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau" + use vdpau || myconf+=" --disable-vdpau" use video_cards_vesa || myconf+=" --disable-vesa" use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" use xscreensaver || myconf+=" --disable-xss" diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index d52a0df50036..37dab68918ce 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.29 2010/03/09 14:25:37 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.30 2010/03/15 15:05:45 lxnay Exp $ EAPI="2" @@ -84,9 +84,7 @@ RDEPEND+=" ) opengl? ( virtual/opengl ) truetype? ( ${FONT_RDEPS} ) - video_cards_nvidia? ( - vdpau? ( >=x11-drivers/nvidia-drivers-180.60 ) - ) + vdpau? ( x11-libs/libvdpau ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( @@ -580,7 +578,7 @@ src_configure() { use dga || myconf+=" --disable-dga1 --disable-dga2" use opengl || myconf+=" --disable-gl" use osdmenu && myconf+=" --enable-menu" - use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau" + use vdpau || myconf+=" --disable-vdpau" use video_cards_vesa || myconf+=" --disable-vesa" use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" use xscreensaver || myconf+=" --disable-xss"