summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-06-28 10:33:06 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-06-28 10:33:06 +0000
commitd4b112b5c78c98ed2dca3d924c8c1f23a8f44264 (patch)
tree347990a4553ef1c3518f2c8af477627c9910bad8 /media-video
parentRevbump for nagios-3, fix quotation (diff)
downloadhistorical-d4b112b5c78c98ed2dca3d924c8c1f23a8f44264.tar.gz
historical-d4b112b5c78c98ed2dca3d924c8c1f23a8f44264.tar.bz2
historical-d4b112b5c78c98ed2dca3d924c8c1f23a8f44264.zip
Force qt4 to be enabled instead of having configure to die when enabling skins, bug #229473
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog7
-rw-r--r--media-video/vlc/Manifest10
-rw-r--r--media-video/vlc/vlc-0.9.0_alpha20080625.ebuild28
3 files changed, 32 insertions, 13 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/Manifest b/media-video/vlc/Manifest
index 8162779f0023..8a217e448b62 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -15,13 +15,13 @@ DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827
EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
EBUILD vlc-0.9.0_alpha20080524.ebuild 10403 RMD160 3b0a5623ea9eab1ffa09cded8635709b5fadd0d6 SHA1 cd48afdffe74a85c0d8192ba23c687a3d7c71de1 SHA256 70360ce22d82ff852a8ee034c751dfcf40d7b83515397fad3f7b7470366684c1
-EBUILD vlc-0.9.0_alpha20080625.ebuild 10027 RMD160 19852b3dadd367a101baf23a9a4e888ca7cd2f95 SHA1 98fb908401443e2bda5e1880bd40847c2c45b236 SHA256 668a0a76f886ddc5c8b4f7d120660aa6320947c7ab675d93820295898b0154f1
-MISC ChangeLog 58060 RMD160 a15cd9978918d10d97e8d2f598a47787a5822a5a SHA1 a2c21a6a0fdb3df199b96e953a4a409127b83dd8 SHA256 6d4bab8fe563a54903399dc77692d739703e2f8f685f66463a4e8326cf814bdf
+EBUILD vlc-0.9.0_alpha20080625.ebuild 10397 RMD160 e0c5f81e72f3c51553ce435b8883c5bb1561d28e SHA1 9874168d5674d695df2ab7e0d4c8aa24d0dd88f9 SHA256 6e37979a88e509b0ae5731a06bfab8a5e4e03e2d4c53d15c2f58edd396c7cd69
+MISC ChangeLog 58243 RMD160 f6b28d0ce548c38e1a72f8e220b1f70982354f9a SHA1 8ad8ac42c779d694f1353b935a6fdaa7c91e83ce SHA256 fe1676fb10961ca73c9064f4d425af03f051a26f95b6be7f43cda943ca4cdbfa
MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkhjRhIACgkQvFcC4BYPU0p/8wCgzeC9+D3ns8X55Tf6mJx4zHj2
-8HwAoMCLpHLvuPFpEM6/Wa06YqI1htMU
-=YP5D
+iEYEARECAAYFAkhmE2oACgkQvFcC4BYPU0rilwCfWKw/W7+bIuUxCqcTEBETxGu1
+CXQAnAxH6lsjvbwVQ5XoiXbg1ntkHmEM
+=1awd
-----END PGP SIGNATURE-----
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) \