diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-06-28 10:33:06 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-06-28 10:33:06 +0000 |
| commit | 6027703fea88908e8d2ec146e64a080f41a6cc81 (patch) | |
| tree | 82e844de357517c6e6cafa70ee4925974472702d /media-video | |
| parent | Revbump for nagios-3, fix quotation (diff) | |
| download | gentoo-2-6027703fea88908e8d2ec146e64a080f41a6cc81.tar.gz gentoo-2-6027703fea88908e8d2ec146e64a080f41a6cc81.tar.bz2 gentoo-2-6027703fea88908e8d2ec146e64a080f41a6cc81.zip | |
Force qt4 to be enabled instead of having configure to die when enabling skins, bug #229473
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vlc/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/vlc/vlc-0.9.0_alpha20080625.ebuild | 28 |
2 files changed, 27 insertions, 8 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index d6d77005d153..3fb3193ca61c 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.347 2008/06/26 07:32:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.348 2008/06/28 10:33:06 aballier Exp $ + + 28 Jun 2008; Alexis Ballier <aballier@gentoo.org> + vlc-0.9.0_alpha20080625.ebuild: + Force qt4 to be enabled instead of having configure to die when enabling + skins, bug #229473 26 Jun 2008; Alexis Ballier <aballier@gentoo.org> vlc-0.9.0_alpha20080625.ebuild: diff --git a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild index a77b788db69e..2927cf1fee52 100644 --- a/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild +++ b/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v 1.6 2008/06/26 07:32:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v 1.7 2008/06/28 10:33:06 aballier Exp $ EAPI="1" @@ -111,6 +111,7 @@ RDEPEND=" sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image ) ) shout? ( media-libs/libshout ) + skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 ) ) speex? ( media-libs/speex ) svg? ( >=gnome-base/librsvg-2.9.0 ) svga? ( media-libs/svgalib ) @@ -158,9 +159,25 @@ vlc_use_needs() { use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." } +# Notify the user that some useflag have been forced on +vlc_use_force() { + use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." +} + +# Use when $2 depends strictly on $3 +# if use $1 then enable $2 and $3, otherwise disable $2 +vlc_use_enable_force() { + if use $1 ; then + echo "--enable-$2 --enable-$3" + else + echo "--disable-$2" + fi +} + + pkg_setup() { vlc_use_needs skins truetype - vlc_use_needs skins qt4 + vlc_use_force skins qt4 vlc_use_needs cdda cdio vlc_use_needs vcdx cdio vlc_use_needs bidi truetype @@ -182,10 +199,6 @@ src_compile () { local XPIDL="" local MOZILLA_CONFIG="" - use vlm && \ - myconf="${myconf} --enable-vlm --enable-sout" || \ - myconf="${myconf} --disable-vlm" - if use nsplugin; then if use xulrunner; then XPIDL=/usr/$(get_libdir)/xulrunner @@ -298,7 +311,8 @@ src_compile () { --disable-growl \ --disable-optimizations \ --enable-fast-install \ - ${myconf} || die "configuration failed" + $(vlc_use_enable_force vlm vlm sout) \ + $(vlc_use_enable_force skins skins2 qt4) # Reminder to re-add this when disabling it will not be broken # $(use_enable stream sout) \ |