Add fbosd and macosx specific useflags

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 46 insertions, 17 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 3950687f27b1..5fb05c928f1a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.677 2011/02/16 19:45:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.678 2011/02/16 20:45:26 aballier Exp $
+
+  16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
+  metadata.xml:
+  Add fbosd and macosx specific useflags
 
   16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   readd some deps for skins useflag that were lost
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 104a14688a79..a9a8782cae56 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,13 +7,13 @@ DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180
 DIST vlc-patches-91.tar.bz2 3955 RMD160 37024ac3d68f0c36f711bb680c573976e4e729e8 SHA1 987ac5f47926d76073e84643023df346f9a0027a SHA256 9863e9fd62bf07641e3e99cbd11194cd462ad99ca1719034badfff74419ec451
 EBUILD vlc-1.1.7.ebuild 12269 RMD160 36dc682bb0549b58f7803aa17a055ef0b971ca53 SHA1 1e561a2088c4c4ed3935d24b2a63f02e495a84fb SHA256 261f17b1624e51706b95cf97e5c342b1012147d9027bb1e485aecef29bdcd7e8
 EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
-EBUILD vlc-9999.ebuild 10186 RMD160 bba6da8000d52c4e5ce15544401ede7cae8eade1 SHA1 a94a47bd38576970b59a6ae1f27c77a9d0c56b06 SHA256 d8a1ef131d9f3994a3326b688cff3d94ab650628a39b5fb6d99d958b8fcc8a8a
-MISC ChangeLog 102432 RMD160 40b24b0fc2245759cecfc6c1ba1ca772cee3cb53 SHA1 077478310f67383b15895b1cc1e1001b5bcafaa8 SHA256 b4feb64743335954668a036fbf8eb994254705e047d4acdd4bedb00a1149b50d
-MISC metadata.xml 5203 RMD160 20e5dfd0543297c47bf6409c7aa265386c025e2b SHA1 34fba29ce0cb8f93ce74477b00d9b2e46c5d2abc SHA256 a2951b4ba0c04d8f01f4733178e0d9b50e697b4cc60f914f8d407ad7a918016d
+EBUILD vlc-9999.ebuild 10712 RMD160 a4221ca8204360d5b0b959447e47fc2619f08c05 SHA1 61f7c8dfb86b339eba8c75b655957c29140ffc2d SHA256 6b4b8cd22a0825e02f3e2316701eb85e73176cff3219a29d69a032abc057e453
+MISC ChangeLog 102559 RMD160 c34332811e7109ad3921e6c09ab65021b78d6d84 SHA1 c2f885d28d6d08002b8bfb6c4a07a1c24fe9f537 SHA256 f5d2a0fe134b253e4b14500c70eaa95d76f2f50fafa2281eb25e62fc8ae3f960
+MISC metadata.xml 5915 RMD160 1215c6962fbeda92c3bbdcc5f1114ca7bb533a51 SHA1 65e7325ac14c61b7bd661079b66cc90da834c78f SHA256 7a1c373be7c476e47746111b716b19483aaf5eab1b5999a7e38b71437d1e476b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1cMEMACgkQvFcC4BYPU0qybgCgkJAlR7Evkak6OTopgHHbw/vK
-X98AnRgt1W6ifd7m3tj/dDaSh/3XXTXD
-=ha7c
+iEYEARECAAYFAk1cN2wACgkQvFcC4BYPU0rqyQCfSu8nyRcQC1Rk3+k9NXsmakzF
+QhgAn1mEe14yGNn+v9FrLrTSNAc2V06l
+=ckTJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 6b7450dc261b..0178f7aa3d9a 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -8,6 +8,7 @@
   </maintainer>
   <use>
     <flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
+	<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
 	<flag name="bda">Enables Win32 DirectShow BDA support.</flag>
 	<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
     <flag name="dc1394">Enables IIDC cameras support.</flag>
@@ -18,6 +19,7 @@
 	<flag name="dshow">Enables Win32 DirectShow support.</flag>
 	<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
 	<flag name="egl">Enables EGL video output module.</flag>
+	<flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
     <flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
     <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
@@ -25,6 +27,7 @@
     <flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
     <flag name="httpd">Enables a web based interface for vlc.</flag>
     <flag name="id3tag">Enables id3tag metadata reader plugin.</flag>
+	<flag name="ios-vout">Enables iPhone OS video output.</flag>
     <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
     <flag name="libass">Enables subtitles support using libass.</flag>
     <flag name="libproxy">Enables support for proxy settings in the HTTP access module.</flag>
@@ -35,6 +38,13 @@
     <flag name="libtiger">Enables Ogg Kate subtitles rendering using libtiger.</flag>
 	<flag name="linsys">Enables support for Linux Linear Systems Ltd. SDI and HD-SDI input cards.</flag>
     <flag name="live">Enables live555 streaming media support (client support for rtsp).</flag>
+	<flag name="macosx">Enables Mac OS X gui support.</flag>
+	<flag name="macosx-audio">Enables Mac OS X audio module.</flag>
+	<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
+	<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
+	<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
+	<flag name="macosx-qtcapture">Enables Mac OS X qtcapture (iSight) module.</flag>
+	<flag name="macosx-vout">Enables Mac OS X video output module.</flag>
 	<flag name="matroska">Enables matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
 	<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
     <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 9f4b7c5c47da..99be9f140b94 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.118 2011/02/16 19:45:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.119 2011/02/16 20:45:26 aballier Exp $
 
 EAPI="4"
 
@@ -45,15 +45,18 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="a52 aac aalib alsa altivec atmo avahi bda bidi bluray cdda cddb dbus dc1394
-	debug dirac direct2d directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode fbcon fluidsynth +ffmpeg flac fontconfig
-	+gcrypt gme gnome gnutls growl httpd ieee1394 jack kate kde libass libcaca
-	libnotify libproxy libtiger libv4l2 linsys lirc live lua matroska mmx
-	modplug mp3 mpeg mtp musepack ncurses ogg omxil opengl optimisememory oss
-	png projectm pulseaudio pvr +qt4 rtsp run-as-root samba
-	schroedinger sdl sdl-image shine shout sid skins speex sqlite sse
-	svg switcher taglib theora truetype twolame udev upnp v4l2 vaapi vcdx vlm
-	vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
+IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi bda bidi bluray cdda
+	cddb dbus dc1394 debug dirac direct2d directfb directx dshow dts dvb +dvbpsi
+	dvd dxva2 elibc_glibc egl +encode fbcon fbosd fluidsynth +ffmpeg flac fontconfig
+	+gcrypt gme gnome gnutls growl httpd ieee1394 ios-vout jack kate kde libass
+	libcaca libnotify libproxy libtiger libv4l2 linsys lirc live lua +macosx
+	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
+	+macosx-qtcapture +macosx-vout matroska mmx modplug mp3 mpeg mtp musepack
+	ncurses ogg omxil opengl optimisememory oss png projectm pulseaudio pvr +qt4
+	rtsp run-as-root samba schroedinger sdl sdl-image shine shout sid skins
+	speex sqlite sse svg switcher taglib theora truetype twolame udev upnp v4l2
+	vaapi vcdx vlm vorbis waveout win32codecs wingdi wma-fixed +X x264 +xcb xml
+	xosd xv zvbi"
 
 RDEPEND="
 		sys-libs/zlib
@@ -83,6 +86,7 @@ RDEPEND="
 		gnome? ( gnome-base/gnome-vfs )
 		gnutls? ( >=net-libs/gnutls-1.7.4 )
 		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
+		ios-vout? ( virtual/opengl )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		kate? ( >=media-libs/libkate-0.1.1 )
 		libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
@@ -94,6 +98,7 @@ RDEPEND="
 		lirc? ( app-misc/lirc )
 		live? ( >=media-plugins/live-2010.10.15 )
 		lua? ( >=dev-lang/lua-5.1 )
+		macosx-vout? ( virtual/opengl )
 		matroska? (	>=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 )
 		modplug? ( >=media-libs/libmodplug-0.8.8.1 )
 		mp3? ( media-libs/libmad )
@@ -140,6 +145,7 @@ DEPEND="${RDEPEND}
 	!!<=media-video/vlc-1.1.99999
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
 	dvb? ( sys-kernel/linux-headers )
+	fbosd? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
 	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
 	xcb? ( x11-proto/xproto )
@@ -195,6 +201,7 @@ src_configure() {
 		$(use_enable alsa) \
 		$(use_enable altivec) \
 		$(use_enable atmo) \
+		$(use_enable audioqueue) \
 		$(use_enable avahi bonjour) \
 		$(use_enable bda) \
 		$(use_enable bidi fribidi) \
@@ -217,6 +224,7 @@ src_configure() {
 		$(use_enable egl) \
 		$(use_enable encode sout) \
 		$(use_enable fbcon fb) \
+		$(use_enable fbosd) \
 		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
 		$(use_enable flac) \
 		$(use_enable fluidsynth) \
@@ -227,6 +235,7 @@ src_configure() {
 		$(use_enable growl) \
 		$(use_enable httpd) \
 		$(use_enable ieee1394 dv) \
+		$(use_enable ios-vout) \
 		$(use_enable jack) \
 		$(use_enable kate) \
 		$(use_with kde kde-solid) \
@@ -242,6 +251,12 @@ src_configure() {
 		$(use_enable lirc) \
 		$(use_enable live live555) \
 		$(use_enable lua) \
+		$(use_enable macosx-audio) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtcapture) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable macosx-vout) \
 		$(use_enable matroska mkv) \
 		$(use_enable mmx) \
 		$(use_enable modplug mod) \