summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-02-16 23:52:10 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-02-16 23:52:10 +0000
commitb683970916d202825dd5c1723928cb34fb554047 (patch)
treecf8a3587e86aca6e00a41857206982d8c417e0ee /media-video/vlc
parentadd link to upstream patch submission (diff)
downloadgentoo-2-b683970916d202825dd5c1723928cb34fb554047.tar.gz
gentoo-2-b683970916d202825dd5c1723928cb34fb554047.tar.bz2
gentoo-2-b683970916d202825dd5c1723928cb34fb554047.zip
switch libX11 dep to a sane one, bug #348518
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-1.1.7.ebuild4
-rw-r--r--media-video/vlc/vlc-1.1.9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 803b737975f8..0c27e479919b 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.683 2011/02/16 22:53:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.684 2011/02/16 23:52:10 aballier Exp $
+
+ 16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.7.ebuild,
+ vlc-1.1.9999.ebuild:
+ switch libX11 dep to a sane one, bug #348518
16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
metadata.xml:
diff --git a/media-video/vlc/vlc-1.1.7.ebuild b/media-video/vlc/vlc-1.1.7.ebuild
index cb83c0e0ac77..e999a6e92442 100644
--- a/media-video/vlc/vlc-1.1.7.ebuild
+++ b/media-video/vlc/vlc-1.1.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.7 2011/02/12 17:55:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.7.ebuild,v 1.8 2011/02/16 23:52:10 aballier Exp $
EAPI="3"
@@ -106,7 +106,7 @@ RDEPEND="
ncurses? ( sys-libs/ncurses )
nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
ogg? ( media-libs/libogg )
- opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+ opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
png? ( media-libs/libpng sys-libs/zlib )
projectm? ( media-libs/libprojectm )
pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index fa5a00453ff4..b12366decdb5 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.23 2011/01/26 10:40:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.24 2011/02/16 23:52:10 aballier Exp $
EAPI="3"
@@ -106,7 +106,7 @@ RDEPEND="
ncurses? ( sys-libs/ncurses )
nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
ogg? ( media-libs/libogg )
- opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+ opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
png? ( media-libs/libpng sys-libs/zlib )
projectm? ( media-libs/libprojectm )
pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22