* [gentoo-commits] gentoo-x86 commit in media-video/vlc: ChangeLog vlc-1.0.9999.ebuild vlc-1.0.6.ebuild
@ 2010-04-23 15:24 Alexis Ballier (aballier)
0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2010-04-23 15:24 UTC (permalink / raw
To: gentoo-commits
aballier 10/04/23 15:24:24
Modified: ChangeLog vlc-1.0.9999.ebuild vlc-1.0.6.ebuild
Log:
Fix some useflag combinations failures reported by andreas schürch <andreas.schuerch@nativenet.ch>, bug #316805 and simplify vlc_use_enable_force
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.572 media-video/vlc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.572&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.572&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.571&r2=1.572
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- ChangeLog 23 Apr 2010 11:08:49 -0000 1.571
+++ ChangeLog 23 Apr 2010 15:24:24 -0000 1.572
@@ -1,6 +1,12 @@
# ChangeLog for media-video/vlc
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.571 2010/04/23 11:08:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.572 2010/04/23 15:24:24 aballier Exp $
+
+ 23 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.6.ebuild,
+ vlc-1.0.9999.ebuild:
+ Fix some useflag combinations failures reported by andreas schürch
+ <andreas.schuerch@nativenet.ch>, bug #316805 and simplify
+ vlc_use_enable_force
*vlc-1.1.9999 (23 Apr 2010)
1.40 media-video/vlc/vlc-1.0.9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild?r1=1.39&r2=1.40
Index: vlc-1.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vlc-1.0.9999.ebuild 7 Apr 2010 16:04:46 -0000 1.39
+++ vlc-1.0.9999.ebuild 23 Apr 2010 15:24:24 -0000 1.40
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.39 2010/04/07 16:04:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.40 2010/04/23 15:24:24 aballier Exp $
EAPI="2"
@@ -126,7 +126,11 @@
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image ) )
shout? ( media-libs/libshout )
- skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+ skins? (
+ x11-libs/qt-gui:4 x11-libs/qt-core:4
+ x11-libs/libXext x11-libs/libX11
+ media-libs/freetype media-fonts/dejavu
+ )
speex? ( media-libs/speex )
svg? ( >=gnome-base/librsvg-2.9.0 )
svga? ( media-libs/svgalib )
@@ -179,13 +183,11 @@
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
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
vlc_use_enable_force() {
if use $1 ; then
- echo "--enable-$2 --enable-$3"
- else
- echo "--disable-$2"
+ echo "--enable-$2"
fi
}
@@ -196,17 +198,20 @@
eerror "the old ${PN} version and will not work."
die "Unmerge vlc 0.9.x first"
fi
- vlc_use_needs skins truetype
- vlc_use_force skins qt4
vlc_use_needs cddax cdio
vlc_use_needs vcdx cdio
vlc_use_needs vcdx vcdinfo
vlc_use_needs vcdinfo cdio
vlc_use_needs bidi truetype
- vlc_use_force remoteosd gcrypt
vlc_use_needs fontconfig truetype
vlc_use_needs libv4l2 v4l2
vlc_use_needs libtiger kate
+ vlc_use_force remoteosd gcrypt
+ vlc_use_force skins truetype
+ vlc_use_force skins qt4
+ vlc_use_force skins X
+ vlc_use_force qt4 X
+ vlc_use_force vlm stream
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
if use qt4 || use skins ; then
qt4_pkg_setup
@@ -318,6 +323,7 @@
$(use_enable pulseaudio pulse) \
$(use_enable pvr) \
$(use_enable qt4) \
+ $(use_enable remoteosd) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
$(use_enable samba smb) \
@@ -342,6 +348,7 @@
$(use_enable v4l2) \
$(use_enable vcdinfo) \
$(use_enable vcdx) \
+ $(use_enable vlm) \
$(use_enable vorbis) \
$(use_enable win32codecs loader) \
$(use_enable wma-fixed) \
@@ -358,9 +365,12 @@
--disable-growl \
--disable-optimizations \
--enable-fast-install \
- $(vlc_use_enable_force vlm vlm sout) \
- $(vlc_use_enable_force skins skins2 qt4) \
- $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+ $(vlc_use_enable_force qt4 x11) \
+ $(vlc_use_enable_force vlm sout) \
+ $(vlc_use_enable_force skins qt4) \
+ $(vlc_use_enable_force skins freetype) \
+ $(vlc_use_enable_force skins x11) \
+ $(vlc_use_enable_force remoteosd libgcrypt)
}
src_install() {
1.2 media-video/vlc/vlc-1.0.6.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild?r1=1.1&r2=1.2
Index: vlc-1.0.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.0.6.ebuild 22 Apr 2010 17:56:02 -0000 1.1
+++ vlc-1.0.6.ebuild 23 Apr 2010 15:24:24 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.1 2010/04/22 17:56:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.6.ebuild,v 1.2 2010/04/23 15:24:24 aballier Exp $
EAPI="2"
@@ -126,7 +126,11 @@
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image ) )
shout? ( media-libs/libshout )
- skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 )
+ skins? (
+ x11-libs/qt-gui:4 x11-libs/qt-core:4
+ x11-libs/libXext x11-libs/libX11
+ media-libs/freetype media-fonts/dejavu
+ )
speex? ( media-libs/speex )
svg? ( >=gnome-base/librsvg-2.9.0 )
svga? ( media-libs/svgalib )
@@ -179,13 +183,11 @@
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
+# Use when $1 depends strictly on $2
+# if use $1 then enable $2
vlc_use_enable_force() {
if use $1 ; then
- echo "--enable-$2 --enable-$3"
- else
- echo "--disable-$2"
+ echo "--enable-$2"
fi
}
@@ -196,17 +198,20 @@
eerror "the old ${PN} version and will not work."
die "Unmerge vlc 0.9.x first"
fi
- vlc_use_needs skins truetype
- vlc_use_force skins qt4
vlc_use_needs cddax cdio
vlc_use_needs vcdx cdio
vlc_use_needs vcdx vcdinfo
vlc_use_needs vcdinfo cdio
vlc_use_needs bidi truetype
- vlc_use_force remoteosd gcrypt
vlc_use_needs fontconfig truetype
vlc_use_needs libv4l2 v4l2
vlc_use_needs libtiger kate
+ vlc_use_force remoteosd gcrypt
+ vlc_use_force skins truetype
+ vlc_use_force skins qt4
+ vlc_use_force skins X
+ vlc_use_force qt4 X
+ vlc_use_force vlm stream
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
if use qt4 || use skins ; then
qt4_pkg_setup
@@ -318,6 +323,7 @@
$(use_enable pulseaudio pulse) \
$(use_enable pvr) \
$(use_enable qt4) \
+ $(use_enable remoteosd) \
$(use_enable rtsp realrtsp) \
$(use_enable run-as-root) \
$(use_enable samba smb) \
@@ -342,6 +348,7 @@
$(use_enable v4l2) \
$(use_enable vcdinfo) \
$(use_enable vcdx) \
+ $(use_enable vlm) \
$(use_enable vorbis) \
$(use_enable win32codecs loader) \
$(use_enable wma-fixed) \
@@ -358,9 +365,12 @@
--disable-growl \
--disable-optimizations \
--enable-fast-install \
- $(vlc_use_enable_force vlm vlm sout) \
- $(vlc_use_enable_force skins skins2 qt4) \
- $(vlc_use_enable_force remoteosd remoteosd libgcrypt)
+ $(vlc_use_enable_force qt4 x11) \
+ $(vlc_use_enable_force vlm sout) \
+ $(vlc_use_enable_force skins qt4) \
+ $(vlc_use_enable_force skins freetype) \
+ $(vlc_use_enable_force skins x11) \
+ $(vlc_use_enable_force remoteosd libgcrypt)
}
src_install() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-23 15:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 15:24 [gentoo-commits] gentoo-x86 commit in media-video/vlc: ChangeLog vlc-1.0.9999.ebuild vlc-1.0.6.ebuild Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox