diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2006-07-11 19:30:58 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2006-07-11 19:30:58 +0000 |
| commit | c20c1c75c5d4ad79707e3dcd96e612126557652b (patch) | |
| tree | 5764c58ffa885c2864dc80d199918386a702d7a6 /media-video | |
| parent | Mark 1.6.2 stable on ia64 (diff) | |
| download | gentoo-2-c20c1c75c5d4ad79707e3dcd96e612126557652b.tar.gz gentoo-2-c20c1c75c5d4ad79707e3dcd96e612126557652b.tar.bz2 gentoo-2-c20c1c75c5d4ad79707e3dcd96e612126557652b.zip | |
Cleanup
(Portage version: 2.1.1_pre2-r4)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre8-r1.ebuild | 78 |
2 files changed, 29 insertions, 54 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 9f94440a2160..faa575e70c54 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.397 2006/07/11 10:07:03 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.398 2006/07/11 19:30:58 lu_zero Exp $ + + 11 Jul 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre8-r1.ebuild: + Cleanup and modular X only now 09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> mplayer-1.0_pre7-r1.ebuild, mplayer-1.0_pre8.ebuild, diff --git a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild index 76e33eae6654..4dc7ee839bd5 100644 --- a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.1 2006/07/11 10:07:03 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.2 2006/07/11 19:30:58 lu_zero Exp $ inherit eutils flag-o-matic @@ -56,17 +56,12 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 ) enca? ( app-i18n/enca ) gif? ( media-libs/giflib ) ggi? ( media-libs/libggi ) - gtk? ( - media-libs/libpng - || ( ( x11-libs/libXxf86vm - x11-libs/libXext - x11-libs/libXi - ) - <virtual/x11-7 - ) - =x11-libs/gtk+-2* - =dev-libs/glib-2* - ) + gtk? ( media-libs/libpng + x11-libs/libXxf86vm + x11-libs/libXext + x11-libs/libXi + =x11-libs/gtk+-2* + =dev-libs/glib-2* ) jpeg? ( media-libs/jpeg ) libcaca? ( media-libs/libcaca ) lirc? ( app-misc/lirc ) @@ -83,30 +78,19 @@ 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? ( || ( ( x11-libs/libXinerama + xinerama? ( x11-libs/libXinerama x11-libs/libXxf86vm - x11-libs/libXext - ) - <virtual/x11-7 - ) - ) + x11-libs/libXext ) xmms? ( media-sound/xmms ) xanim? ( >=media-video/xanim-2.80.1-r4 ) sys-libs/ncurses - xv? ( || ( ( x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/libXext - ) - <virtual/x11-7 - ) - ) - xvmc? ( x11-libs/libXvMC ) - X? ( || ( ( x11-libs/libXxf86vm - x11-libs/libXext - ) - <virtual/x11-7 - ) - )" + xv? ( x11-libs/libXv + x11-libs/libXxf86vm + x11-libs/libXext + xvmc? ( x11-libs/libXvMC ) ) + X? ( x11-libs/libXxf86vm + x11-libs/libXext ) + " DEPEND="${RDEPEND} app-arch/unzip @@ -115,26 +99,14 @@ DEPEND="${RDEPEND} >=app-text/docbook-xml-simple-dtd-1.50.0 dev-libs/libxslt ) - dga? ( || ( x11-proto/xf86dgaproto virtual/x11 ) ) - xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) ) - xv? ( || ( ( x11-proto/videoproto - x11-proto/xf86vidmodeproto - ) - <virtual/x11-7 - ) - ) - gtk? ( || ( ( x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - <virtual/x11-7 - ) - ) - X? ( || ( ( x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) - <virtual/x11-7 - ) - ) + dga? ( x11-proto/xf86dgaproto ) + xinerama? ( x11-proto/xineramaproto ) + xv? ( x11-proto/videoproto + x11-proto/xf86vidmodeproto ) + gtk? ( x11-proto/xextproto + x11-proto/xf86vidmodeproto ) + X? ( x11-proto/xextproto + x11-proto/xf86vidmodeproto ) unicode? ( virtual/libiconv )" SLOT="0" @@ -408,7 +380,7 @@ src_compile() { myconf="${myconf} $(use_enable tga)" - if use xvmc + if use xv && use xvmc then myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCW" else |