summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-07-24 12:02:47 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-07-24 12:02:47 +0000
commit448e3c3d6bf738a6a07f19f3a5e54d78a0ecc4ae (patch)
treed3b850761724bcc6c4ebffe30e5a7ae9b9dcc992 /media-video/vlc
parentUnmask spandsp newest version as it looks to work for packages working with p... (diff)
downloadgentoo-2-448e3c3d6bf738a6a07f19f3a5e54d78a0ecc4ae.tar.gz
gentoo-2-448e3c3d6bf738a6a07f19f3a5e54d78a0ecc4ae.tar.bz2
gentoo-2-448e3c3d6bf738a6a07f19f3a5e54d78a0ecc4ae.zip
Disable telx when zvbi is enabled.
(Portage version: 2.2_rc33/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.0.0.ebuild4
-rw-r--r--media-video/vlc/vlc-1.0.9999.ebuild4
-rw-r--r--media-video/vlc/vlc-9999.ebuild4
4 files changed, 11 insertions, 7 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 8b8661c183a1..20c11b6ea14c 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.477 2009/07/23 18:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.478 2009/07/24 12:02:47 aballier Exp $
+
+ 24 Jul 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.0.ebuild,
+ vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+ Disable telx when zvbi is enabled.
23 Jul 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.0.ebuild,
vlc-1.0.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/vlc-1.0.0.ebuild b/media-video/vlc/vlc-1.0.0.ebuild
index 79e753ca37b8..38dd857b8996 100644
--- a/media-video/vlc/vlc-1.0.0.ebuild
+++ b/media-video/vlc/vlc-1.0.0.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.0.ebuild,v 1.9 2009/07/23 18:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0.ebuild,v 1.10 2009/07/24 12:02:47 aballier Exp $
EAPI="2"
@@ -354,7 +354,7 @@ src_configure() {
$(use_enable xosd) \
$(use_enable xv xvideo) \
--disable-xvmc \
- $(use_enable zvbi) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
--disable-snapshot \
--disable-growl \
--disable-optimizations \
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index 0fa35d9334df..437211af60ad 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.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.9999.ebuild,v 1.18 2009/07/23 18:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.19 2009/07/24 12:02:47 aballier Exp $
EAPI="2"
@@ -355,7 +355,7 @@ src_configure() {
$(use_enable xosd) \
$(use_enable xv xvideo) \
--disable-xvmc \
- $(use_enable zvbi) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
--disable-snapshot \
--disable-growl \
--disable-optimizations \
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 804766d5ffc7..625c12fdacc8 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.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-9999.ebuild,v 1.25 2009/07/23 18:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.26 2009/07/24 12:02:47 aballier Exp $
EAPI="2"
@@ -357,7 +357,7 @@ src_configure() {
$(use_enable xosd) \
$(use_enable xv xvideo) \
--disable-xvmc \
- $(use_enable zvbi) \
+ $(use_enable zvbi) $(use_enable !zvbi telx) \
--disable-snapshot \
--disable-growl \
--disable-optimizations \