summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 04:41:08 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-12 04:41:08 +0000
commit77191f905c6734b478d52648a5d78ff76a40399d (patch)
treec795bfa41a7634e100094522f0f6a8456f57ae25 /media-video
parentVersion bump. (diff)
downloadhistorical-77191f905c6734b478d52648a5d78ff76a40399d.tar.gz
historical-77191f905c6734b478d52648a5d78ff76a40399d.tar.bz2
historical-77191f905c6734b478d52648a5d78ff76a40399d.zip
(#110990) Add modular X dependencies.
Package-Manager: portage-2.0.53
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest4
-rw-r--r--media-video/mplayer/mplayer-1.0_pre7-r1.ebuild57
3 files changed, 58 insertions, 9 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index aff54af84f1f..d1c40278fcf2 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.333 2005/12/03 22:31:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.334 2005/12/12 04:41:08 spyderous Exp $
+
+ 12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ mplayer-1.0_pre7-r1.ebuild:
+ (#110990) Add modular X dependencies.
03 Dec 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
Typo fixed, thanks Oldrich Jedlicka <oldium.pro@seznam.cz> for reporting
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index df7f583d1d5b..79c9d771cc09 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,4 @@
-MD5 3094108c09b68b669ec778e536492174 ChangeLog 61801
+MD5 fd3bfea903d06b5a6da64fe836702aca ChangeLog 61929
MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
@@ -9,4 +9,4 @@ MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 a2b68467c55f89f6a1e8b7b3b33e679b mplayer-1.0_pre7-r1.ebuild 16072
+MD5 c5ddcc9e168088399a521c93f459df9f mplayer-1.0_pre7-r1.ebuild 16883
diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index 659a49dab951..ae097401cd92 100644
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.15 2005/12/07 11:40:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.16 2005/12/12 04:41:08 spyderous Exp $
inherit eutils flag-o-matic
@@ -39,7 +39,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
arts? ( kde-base/arts )
bidi? ( dev-libs/fribidi )
cdparanoia? ( media-sound/cdparanoia )
- dga? ( virtual/x11 )
+ dga? ( || ( x11-libs/libXxf86dga virtual/x11 ) )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdts )
dvd? ( dvdread? ( media-libs/libdvdread ) )
@@ -52,7 +52,12 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
ggi? ( media-libs/libggi )
gtk? (
media-libs/libpng
- virtual/x11
+ || ( ( x11-libs/libXxf86vm
+ x11-libs/libXext
+ x11-libs/libXi
+ )
+ virtual/x11
+ )
=x11-libs/gtk+-1.2*
=dev-libs/glib-1.2*
)
@@ -72,14 +77,54 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
theora? ( media-libs/libtheora )
live? ( >=media-plugins/live-2004.07.20 )
truetype? ( >=media-libs/freetype-2.1 )
- xinerama? ( virtual/x11 )
+ xinerama? ( || ( ( x11-libs/libXinerama
+ x11-libs/libXxf86vm
+ x11-libs/libXext
+ )
+ virtual/x11
+ )
+ )
jack? ( >=media-libs/bio2jack-0.4 )
xmms? ( media-sound/xmms )
xanim? ( >=media-video/xanim-2.80.1-r4 )
- sys-libs/ncurses"
+ sys-libs/ncurses
+ xv? ( || ( ( x11-libs/libXv
+ x11-libs/libXxf86vm
+ x11-libs/libXext
+ )
+ virtual/x11
+ )
+ )
+ xvmc? ( || ( x11-libs/libXvMC virtual/x11 ) )
+ X? ( || ( ( x11-libs/libXxf86vm
+ x11-libs/libXext
+ )
+ virtual/x11
+ )
+ )"
DEPEND="${RDEPEND}
- app-arch/unzip"
+ app-arch/unzip
+ dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) )
+ xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+ xv? ( || ( ( x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+ )
+ virtual/x11
+ )
+ )
+ gtk? ( || ( ( x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ virtual/x11
+ )
+ )
+ X? ( || ( ( x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ virtual/x11
+ )
+ )"
SLOT="0"
LICENSE="GPL-2"