* [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.0_pre2.ebuild vlc-9999.ebuild
@ 2010-04-23 16:18 Alexis Ballier (aballier)
0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2010-04-23 16:18 UTC (permalink / raw
To: gentoo-commits
aballier 10/04/23 16:18:10
Modified: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.0_pre2.ebuild
vlc-9999.ebuild
Log:
Simplify vlc_use_enable_force here too, fix some useflags deps, require dbus on avahi for avahi-client
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 media-video/vlc/vlc-1.1.9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.1&r2=1.2
Index: vlc-1.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.1.9999.ebuild 23 Apr 2010 11:08:49 -0000 1.1
+++ vlc-1.1.9999.ebuild 23 Apr 2010 16:18:09 -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.1.9999.ebuild,v 1.1 2010/04/23 11:08:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $
EAPI="2"
@@ -63,7 +63,7 @@
aalib? ( media-libs/aalib )
aac? ( >=media-libs/faad2-2.6.1 )
alsa? ( media-libs/alsa-lib )
- avahi? ( >=net-dns/avahi-0.6 )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
@@ -120,7 +120,11 @@
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
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 )
sqlite? ( >=dev-db/sqlite-3.6.0:3 )
svg? ( >=gnome-base/librsvg-2.9.0 )
@@ -164,14 +168,10 @@
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"
- fi
+ use $1 && echo "--enable-$2"
}
pkg_setup() {
@@ -181,16 +181,22 @@
eerror "the old ${PN} version and will not work."
die "Unmerge vlc 1.0.x first"
fi
- vlc_use_needs skins truetype
+
+ # Useflags we need to forcefuly enable
+ vlc_use_force remoteosd gcrypt
+ vlc_use_force skins truetype
vlc_use_force skins qt4
+ vlc_use_force vlm stream
+
+ # Useflags that will be automagically discarded if deps are not met
vlc_use_needs bidi truetype
- vlc_use_force remoteosd gcrypt
+ vlc_use_needs cddb cdda
vlc_use_needs fontconfig truetype
vlc_use_needs libv4l2 v4l2
vlc_use_needs libv4l v4l
vlc_use_needs libtiger kate
vlc_use_needs xv xcb
- vlc_use_needs cddb cdda
+
if use qt4 || use skins ; then
qt4_pkg_setup
else
@@ -287,6 +293,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) \
@@ -311,6 +318,7 @@
$(use_enable v4l) \
$(use_enable v4l2) \
$(use_enable vcdx) \
+ $(use_enable vlm) \
$(use_enable vorbis) \
$(use_enable win32codecs loader) \
$(use_enable wma-fixed) \
@@ -324,9 +332,10 @@
--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 vlm sout) \
+ $(vlc_use_enable_force skins qt4) \
+ $(vlc_use_enable_force skins freetype) \
+ $(vlc_use_enable_force remoteosd libgcrypt)
}
src_install() {
1.573 media-video/vlc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.573&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.573&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.572&r2=1.573
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- ChangeLog 23 Apr 2010 15:24:24 -0000 1.572
+++ ChangeLog 23 Apr 2010 16:18:09 -0000 1.573
@@ -1,6 +1,11 @@
# 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.572 2010/04/23 15:24:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.573 2010/04/23 16:18:09 aballier Exp $
+
+ 23 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.0_pre2.ebuild,
+ vlc-1.1.9999.ebuild, vlc-9999.ebuild:
+ Simplify vlc_use_enable_force here too, fix some useflags deps, require
+ dbus on avahi for avahi-client
23 Apr 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.0.6.ebuild,
vlc-1.0.9999.ebuild:
1.2 media-video/vlc/vlc-1.1.0_pre2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild?r1=1.1&r2=1.2
Index: vlc-1.1.0_pre2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.1.0_pre2.ebuild 22 Apr 2010 19:26:40 -0000 1.1
+++ vlc-1.1.0_pre2.ebuild 23 Apr 2010 16:18:09 -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.1.0_pre2.ebuild,v 1.1 2010/04/22 19:26:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0_pre2.ebuild,v 1.2 2010/04/23 16:18:09 aballier Exp $
EAPI="2"
@@ -63,7 +63,7 @@
aalib? ( media-libs/aalib )
aac? ( >=media-libs/faad2-2.6.1 )
alsa? ( media-libs/alsa-lib )
- avahi? ( >=net-dns/avahi-0.6 )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
@@ -120,7 +120,11 @@
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
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 )
sqlite? ( >=dev-db/sqlite-3.6.0:3 )
svg? ( >=gnome-base/librsvg-2.9.0 )
@@ -164,14 +168,10 @@
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"
- fi
+ use $1 && echo "--enable-$2"
}
pkg_setup() {
@@ -181,16 +181,22 @@
eerror "the old ${PN} version and will not work."
die "Unmerge vlc 1.0.x first"
fi
- vlc_use_needs skins truetype
+
+ # Useflags we need to forcefuly enable
+ vlc_use_force remoteosd gcrypt
+ vlc_use_force skins truetype
vlc_use_force skins qt4
+ vlc_use_force vlm stream
+
+ # Useflags that will be automagically discarded if deps are not met
vlc_use_needs bidi truetype
- vlc_use_force remoteosd gcrypt
+ vlc_use_needs cddb cdda
vlc_use_needs fontconfig truetype
vlc_use_needs libv4l2 v4l2
vlc_use_needs libv4l v4l
vlc_use_needs libtiger kate
vlc_use_needs xv xcb
- vlc_use_needs cddb cdda
+
if use qt4 || use skins ; then
qt4_pkg_setup
else
@@ -287,6 +293,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) \
@@ -311,6 +318,7 @@
$(use_enable v4l) \
$(use_enable v4l2) \
$(use_enable vcdx) \
+ $(use_enable vlm) \
$(use_enable vorbis) \
$(use_enable win32codecs loader) \
$(use_enable wma-fixed) \
@@ -324,9 +332,10 @@
--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 vlm sout) \
+ $(vlc_use_enable_force skins qt4) \
+ $(vlc_use_enable_force skins freetype) \
+ $(vlc_use_enable_force remoteosd libgcrypt)
}
src_install() {
1.69 media-video/vlc/vlc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.68&r2=1.69
Index: vlc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vlc-9999.ebuild 12 Apr 2010 16:36:12 -0000 1.68
+++ vlc-9999.ebuild 23 Apr 2010 16:18:09 -0000 1.69
@@ -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-9999.ebuild,v 1.68 2010/04/12 16:36:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.69 2010/04/23 16:18:09 aballier Exp $
EAPI="2"
@@ -63,7 +63,7 @@
aalib? ( media-libs/aalib )
aac? ( >=media-libs/faad2-2.6.1 )
alsa? ( media-libs/alsa-lib )
- avahi? ( >=net-dns/avahi-0.6 )
+ avahi? ( >=net-dns/avahi-0.6[dbus] )
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
@@ -120,7 +120,11 @@
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
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 )
sqlite? ( >=dev-db/sqlite-3.6.0:3 )
svg? ( >=gnome-base/librsvg-2.9.0 )
@@ -164,14 +168,10 @@
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"
- fi
+ use $1 && echo "--enable-$2"
}
pkg_setup() {
@@ -181,16 +181,22 @@
eerror "the old ${PN} version and will not work."
die "Unmerge vlc 1.0.x first"
fi
- vlc_use_needs skins truetype
+
+ # Useflags we need to forcefuly enable
+ vlc_use_force remoteosd gcrypt
+ vlc_use_force skins truetype
vlc_use_force skins qt4
+ vlc_use_force vlm stream
+
+ # Useflags that will be automagically discarded if deps are not met
vlc_use_needs bidi truetype
- vlc_use_force remoteosd gcrypt
+ vlc_use_needs cddb cdda
vlc_use_needs fontconfig truetype
vlc_use_needs libv4l2 v4l2
vlc_use_needs libv4l v4l
vlc_use_needs libtiger kate
vlc_use_needs xv xcb
- vlc_use_needs cddb cdda
+
if use qt4 || use skins ; then
qt4_pkg_setup
else
@@ -287,6 +293,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) \
@@ -311,6 +318,7 @@
$(use_enable v4l) \
$(use_enable v4l2) \
$(use_enable vcdx) \
+ $(use_enable vlm) \
$(use_enable vorbis) \
$(use_enable win32codecs loader) \
$(use_enable wma-fixed) \
@@ -324,9 +332,10 @@
--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 vlm sout) \
+ $(vlc_use_enable_force skins qt4) \
+ $(vlc_use_enable_force skins freetype) \
+ $(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 16:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 16:18 [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.0_pre2.ebuild vlc-9999.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