| 1 |
aballier 08/06/28 10:33:06 |
| 2 |
|
| 3 |
Modified: ChangeLog vlc-0.9.0_alpha20080625.ebuild |
| 4 |
Log: |
| 5 |
Force qt4 to be enabled instead of having configure to die when enabling skins, bug #229473 |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.348 media-video/vlc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.348&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.348&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.347&r2=1.348 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 18 |
retrieving revision 1.347 |
| 19 |
retrieving revision 1.348 |
| 20 |
diff -u -r1.347 -r1.348 |
| 21 |
--- ChangeLog 26 Jun 2008 07:32:26 -0000 1.347 |
| 22 |
+++ ChangeLog 28 Jun 2008 10:33:06 -0000 1.348 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for media-video/vlc |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.347 2008/06/26 07:32:26 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.348 2008/06/28 10:33:06 aballier Exp $ |
| 28 |
+ |
| 29 |
+ 28 Jun 2008; Alexis Ballier <aballier@g.o> |
| 30 |
+ vlc-0.9.0_alpha20080625.ebuild: |
| 31 |
+ Force qt4 to be enabled instead of having configure to die when enabling |
| 32 |
+ skins, bug #229473 |
| 33 |
|
| 34 |
26 Jun 2008; Alexis Ballier <aballier@g.o> |
| 35 |
vlc-0.9.0_alpha20080625.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.7 media-video/vlc/vlc-0.9.0_alpha20080625.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?rev=1.7&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?rev=1.7&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild?r1=1.6&r2=1.7 |
| 44 |
|
| 45 |
Index: vlc-0.9.0_alpha20080625.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080625.ebuild,v |
| 48 |
retrieving revision 1.6 |
| 49 |
retrieving revision 1.7 |
| 50 |
diff -u -r1.6 -r1.7 |
| 51 |
--- vlc-0.9.0_alpha20080625.ebuild 26 Jun 2008 07:32:26 -0000 1.6 |
| 52 |
+++ vlc-0.9.0_alpha20080625.ebuild 28 Jun 2008 10:33:06 -0000 1.7 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI="1" |
| 60 |
|
| 61 |
@@ -111,6 +111,7 @@ |
| 62 |
sdl? ( >=media-libs/libsdl-1.2.8 |
| 63 |
sdl-image? ( media-libs/sdl-image ) ) |
| 64 |
shout? ( media-libs/libshout ) |
| 65 |
+ skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) >=x11-libs/qt-4.2.0:4 ) ) |
| 66 |
speex? ( media-libs/speex ) |
| 67 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
| 68 |
svga? ( media-libs/svgalib ) |
| 69 |
@@ -158,9 +159,25 @@ |
| 70 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
| 71 |
} |
| 72 |
|
| 73 |
+# Notify the user that some useflag have been forced on |
| 74 |
+vlc_use_force() { |
| 75 |
+ use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled." |
| 76 |
+} |
| 77 |
+ |
| 78 |
+# Use when $2 depends strictly on $3 |
| 79 |
+# if use $1 then enable $2 and $3, otherwise disable $2 |
| 80 |
+vlc_use_enable_force() { |
| 81 |
+ if use $1 ; then |
| 82 |
+ echo "--enable-$2 --enable-$3" |
| 83 |
+ else |
| 84 |
+ echo "--disable-$2" |
| 85 |
+ fi |
| 86 |
+} |
| 87 |
+ |
| 88 |
+ |
| 89 |
pkg_setup() { |
| 90 |
vlc_use_needs skins truetype |
| 91 |
- vlc_use_needs skins qt4 |
| 92 |
+ vlc_use_force skins qt4 |
| 93 |
vlc_use_needs cdda cdio |
| 94 |
vlc_use_needs vcdx cdio |
| 95 |
vlc_use_needs bidi truetype |
| 96 |
@@ -182,10 +199,6 @@ |
| 97 |
local XPIDL="" |
| 98 |
local MOZILLA_CONFIG="" |
| 99 |
|
| 100 |
- use vlm && \ |
| 101 |
- myconf="${myconf} --enable-vlm --enable-sout" || \ |
| 102 |
- myconf="${myconf} --disable-vlm" |
| 103 |
- |
| 104 |
if use nsplugin; then |
| 105 |
if use xulrunner; then |
| 106 |
XPIDL=/usr/$(get_libdir)/xulrunner |
| 107 |
@@ -298,7 +311,8 @@ |
| 108 |
--disable-growl \ |
| 109 |
--disable-optimizations \ |
| 110 |
--enable-fast-install \ |
| 111 |
- ${myconf} || die "configuration failed" |
| 112 |
+ $(vlc_use_enable_force vlm vlm sout) \ |
| 113 |
+ $(vlc_use_enable_force skins skins2 qt4) |
| 114 |
|
| 115 |
# Reminder to re-add this when disabling it will not be broken |
| 116 |
# $(use_enable stream sout) \ |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
-- |
| 121 |
gentoo-commits@l.g.o mailing list |
Archives