summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-10-27 11:36:13 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-10-27 11:36:13 +0000
commitb29205e6bd5d558b93a392334631b10dd830aa75 (patch)
tree1c41720decdb96b1eb1d4937d69c3935751e6cf9 /media-video
parentversion bump, by Sergiy Borodych <bor@univ.kiev.ua>, bug #289036 (diff)
downloadgentoo-2-b29205e6bd5d558b93a392334631b10dd830aa75.tar.gz
gentoo-2-b29205e6bd5d558b93a392334631b10dd830aa75.tar.bz2
gentoo-2-b29205e6bd5d558b93a392334631b10dd830aa75.zip
adjust x264 deps
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-0.9.10.ebuild4
-rw-r--r--media-video/vlc/vlc-1.0.2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 2c09f3b9c217..d01c369956d8 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.526 2009/10/22 13:12:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.527 2009/10/27 11:36:13 aballier Exp $
+
+ 27 Oct 2009; Alexis Ballier <aballier@gentoo.org> vlc-0.9.10.ebuild,
+ vlc-1.0.2.ebuild:
+ adjust x264 deps
*vlc-1.0.3_rc (22 Oct 2009)
diff --git a/media-video/vlc/vlc-0.9.10.ebuild b/media-video/vlc/vlc-0.9.10.ebuild
index 1798cd0e2890..5dfb43365a10 100644
--- a/media-video/vlc/vlc-0.9.10.ebuild
+++ b/media-video/vlc/vlc-0.9.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.10.ebuild,v 1.8 2009/10/17 10:46:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.10.ebuild,v 1.9 2009/10/27 11:36:13 aballier Exp $
EAPI="1"
@@ -143,7 +143,7 @@ RDEPEND="
xinerama? ( x11-libs/libXinerama )
opengl? ( virtual/opengl )
)
- x264? ( media-libs/x264 )
+ x264? ( <=media-libs/x264-0.0.20090629 )
xml? ( dev-libs/libxml2 )
xosd? ( x11-libs/xosd )
zvbi? ( >=media-libs/zvbi-0.2.25 )
diff --git a/media-video/vlc/vlc-1.0.2.ebuild b/media-video/vlc/vlc-1.0.2.ebuild
index cde4c46fc471..c23f2ba53a1e 100644
--- a/media-video/vlc/vlc-1.0.2.ebuild
+++ b/media-video/vlc/vlc-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.2.ebuild,v 1.12 2009/10/18 19:08:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.2.ebuild,v 1.13 2009/10/27 11:36:13 aballier Exp $
EAPI="2"
@@ -149,7 +149,7 @@ RDEPEND="
xinerama? ( x11-libs/libXinerama )
opengl? ( virtual/opengl )
)
- x264? ( media-libs/x264 )
+ x264? ( <media-libs/x264-0.0.20091021 )
xcb? ( x11-libs/libxcb x11-libs/xcb-util )
xml? ( dev-libs/libxml2 )
xosd? ( x11-libs/xosd )