Preparation for version bump by updating 9999 ebuild, small USE flag and medium configure parameter changes.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 44 insertions, 21 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7097c772728a..0e06b9154251 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.884 2014/01/30 18:13:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.885 2014/02/20 20:32:14 tomwij Exp $
+
+  20 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml, vlc-9999.ebuild:
+  Preparation for version bump by updating 9999 ebuild, small USE flag and
+  medium configure parameter changes.
 
   30 Jan 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
   vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.1.0.ebuild, vlc-2.1.1.ebuild,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 132ae477b680..c535c738fd32 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -29,18 +29,18 @@ EBUILD vlc-2.1.0.ebuild 14129 SHA256 0f091492a2721738e566d24ca40e40c9b1026c56012
 EBUILD vlc-2.1.1.ebuild 14107 SHA256 3ab60dfe7c56425349fe0700fe178542fb4bd4e3f891c7d38f752e7049021ae4 SHA512 64dba17667e999824157d5c139d28f2b0f00ce9ef06c955e786beafa6b4e9ac5d87a551f24dfbdb13484262cfe3d22225b7fa81cf4020807498e141606dd06bf WHIRLPOOL 7797391668bad21ad29ac83b1aa3430d1330c7f47b5a4c08c57a2e8a39c76f8c7f4449867b747a61abe0f7e452a32dcc688aa56b10da34fa2f88c88455c9c8ed
 EBUILD vlc-2.1.2.ebuild 14107 SHA256 b1b4b34b73c086d31db8086a4ef8eff97599ae2a7176c3353ff43eef8f2d1b7b SHA512 9cae76d1a288f924ddf89079059c922ff34b1b9f86c487d17150b5e6be7a1faed0a8a0a54198878911968a8dbd00408bbb379882cfc8f17771bfa75f846f10dc WHIRLPOOL b7130ef09bc50195485ac4b1162f7ec37fcbf9cd9cdccb5988ab33173d1f9c871f9d47123434ec2d44be3450f12e16e120d778e1d257b950ab1411e2ee55782f
 EBUILD vlc-2.1.9999.ebuild 14111 SHA256 376afb90015454461079e9dd65dcccb89a11a4ef3b7697ec3b2ab9f1568603a6 SHA512 9adf11881d1c30d3d3a7d2b7db1770ff19ec73590bc163ddcb68c5aad1fe5774abc73bb807cc8d9d7ebb0ad6fa1e734d30362d92e5c13c8cc954586a8a0d3343 WHIRLPOOL b06cd2630d8c6e723fce454b70ece8e02ed79032fa11928ba92ca78bb76e2298d9e57c3ab1efb9ff9266af6e57e39c13e26df71ed62dce1ab2425bc9dcf616d8
-EBUILD vlc-9999.ebuild 14348 SHA256 a034960e3a4cf72b039b3152b864580367b9dbe95486519ed7980731f8babbff SHA512 90303b6d967ff68bae261f451feb369b5db033fc2ef2a5885a196c9318e292231529908935311477acea527d1407e445af3765c3686996a00fc6216746b6278e WHIRLPOOL 3517464862f771762e90c0d774561e366a2701f83aa50298b5419f36ebfbc9952b45965b225dd264ed81b02e6be9fdeda23f7fa677f3ed5059847473d92846c6
-MISC ChangeLog 22686 SHA256 e395706f23100251ff8158527e8604e514f85210ca81acae80781b0682c5d34c SHA512 6fe1d02bf00a0e22a11c97b4f424c0eb0aa37f6b46c9c117ed7301586fec66e248dfd31cc95a904473c3eeb019a57aded8e78dad23a7a4af3b37acd4196995ff WHIRLPOOL ae4b71634037ae2ac957a1fa5655030580bcf337f4f5b8ef705830f61e34e8f56f32bef485cae40341ba1bfe9d325f7d0daf8619500e36ac7d87058a5db0591b
+EBUILD vlc-9999.ebuild 14790 SHA256 07b876677ba9b5657e8466993f8f3c8e108544fb1cafb242e2c49906881b893b SHA512 6598a6acb80aeb01c23d95ef44e15f69dcf57f6a380ecb170831f6c425395dc7d5eac4566e1e0e4b3fd34d26d76152c4675ad6488cade1061bf7c042680d788b WHIRLPOOL 7fc5bc0e410c26a94e12d7a29fd4840e3688751143e563c65d0f633426e7363633980f6c6ba58395fd9839ba24ce4d123f188cbd6b1f976e65ecb437b66ffae1
+MISC ChangeLog 22878 SHA256 d0ba3eb7511568fbe931cf46f430faf75de7ea2d97ea178fa9f1a6ee352a9c2a SHA512 e63ed0360446794df25b827a3393e4029c078f92b4e14a20badc9267776e4d948a2b63da965237f5dc1aa6a2390e4b5fcd4f9b7062e8ad3306291e00d525020c WHIRLPOOL 3406cecbe47c308128761ef78a9b70e6ec3d07907186ae4043a503b7351498bb1286efb9f9ea6766e4b45f25905ff2a17adf30b8b0632bbaed4ebc326894dd9b
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
-MISC metadata.xml 6844 SHA256 a3811bd21c177f53d9355c64713de4745b21508bb67feba129b39316be67e985 SHA512 b464088eba743833a8b2c4b89bb6c5bd961dc0304acd2f0fe3c0f4c4a6b73187e24fb47655ebd0670d5fa6bd1dc1204477a755549ff73a321b84e99734e94b23 WHIRLPOOL 003aab808c9d364ae3c6e1d15f7fc40d46236087ae1177455957b1e265f7c60a98888d8121364b41e8ed7004299d9245337e0afab31dfbd0491c0a60ee05ccef
+MISC metadata.xml 6954 SHA256 6acc4e826f320345c3e1d961f0950e9fd119c305529779045bd24a89f4705d96 SHA512 5c9831c6cba4ecaebc27011677dec137f2b60b6422b9d424a8c14ccc12f2cb3b247ab7d8d1ee86f6f74df3b93c90a8b16e2f34e7189b68a2ff2d84a6cab0ce86 WHIRLPOOL 518fac392d20bdb608699d7274f192016b10cd81ca0e03c6d875e268d169f51db188880aea0208bd9679e75bc1a8d2f2af7b230c493970c6fbec3642e3504f24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS6pX/AAoJEJWyH81tNOV9OwsIALm1cwKfWMMlMnFRQixth/ZH
-GZ1gjJBqvCJWpXeRoKPsBZ6LyInnxt/D8F4ylBIjjvG5vKY3j2s0EJ5k/RUzvMJ7
-OuUVo5FiB3UW0bkBviLntFoxgqx9yZC1U3HfGiWNT1H8jMASoZxWQxsaqfpNNmMt
-GL9h3lrjV4LZobwJ+CA9ZCnovPz0iPcx1WIQLMJR5Avt5fWRIxMYYWMbGd/J60LP
-Pr5HbyQhMDTlzSVlLpv7s+84yavrtnO4xZwjkJ8UM7nSCzNdUCjgqGRax0sP1T1e
-+clvJR4Z8RICOQieLy1Aj60nTurGDCPIqVFKVYTz9f9reMdAzNBG7uCYAt8ypSM=
-=zjdb
+iQEcBAEBCAAGBQJTBmZIAAoJEJWyH81tNOV9JP0IAMc773tlau+94lqlORw7ini4
+LX3L9h8la0FnUpCgjdVvy9Dx2gPGRK2qa/YgI+DREWeM4gO+Bt7ISBgSwV1xI9b5
+DLpkI3OIoPbG4aYl5q1sxwhTB5N9DOq7WRdeiWx5ENecySnAtAQQz/bcKjkBKAkz
+als88Nb0xrUslaayxEML66pnGr18cJWpbh2sjkPPL+fIXOD92A/0iWVK99oqJ8d+
+T6g40lOyq+3Hfi9tczu3fm/KK2B0sYnNoE1hobBHfkzbKoZ4FnNw1GdL3jkyUZZ4
+iaiPDLwUskL9UOeiuNtExoDyWB8k4H4nUvvsDOuKEx4SkgUln8rFYfbHupumYVA=
+=IDFI
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 67711b93c3bc..941cd51daecb 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -26,6 +26,8 @@
 		<flag name="fdk">Enables the Fraunhofer AAC codec library.</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="gles1">Enables support for GLES1.</flag>
+		<flag name="gles2">Enables support for GLES2.</flag>
 		<flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
 		<flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related.</flag>
 		<flag name="growl">Enables growl notification support (over UDP for remote access and native on OSX)</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index dc03164bc1a5..1c1cf225dbed 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.208 2014/01/30 16:40:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.209 2014/02/20 20:32:14 tomwij Exp $
 
 EAPI="5"
 
@@ -41,10 +41,10 @@ else
 fi
 
 IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
 	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode faad fdk
-	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gles1 gles2 gme gnome gnutls
+	growl httpd ieee1394 ios-vout jack jpeg kate kde libass libcaca libnotify
 	libsamplerate libtiger linsys libtar lirc live lua +macosx
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
 	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
@@ -67,12 +67,11 @@ RDEPEND="
 		avcodec? ( virtual/ffmpeg:0 )
 		avformat? ( virtual/ffmpeg:0 )
 		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
+		bluray? ( >=media-libs/libbluray-0.3.0:0 )
 		cddb? ( >=media-libs/libcddb-1.2.0:0 )
 		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
 		dbus? ( >=sys-apps/dbus-1.0.2:0 )
 		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1.0:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
 		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
 		dts? ( media-libs/libdca:0 )
 		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
@@ -85,12 +84,15 @@ RDEPEND="
 		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
 		fontconfig? ( media-libs/fontconfig:1.0 )
 		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0 )
+		gles1? ( virtual/opengles:0 )
+		gles2? ( virtual/opengles:0 )
 		gme? ( media-libs/game-music-emu:0 )
 		gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
 		gnutls? ( >=net-libs/gnutls-3.0.20:0 )
 		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
 		ios-vout? ( virtual/opengl:0 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
+		jpeg? ( virtual/jpeg:0 )
 		kate? ( >=media-libs/libkate-0.3.0:0 )
 		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
 		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
@@ -158,6 +160,7 @@ DEPEND="${RDEPEND}
 	kde? ( >=kde-base/kdelibs-4:4 )
 	xcb? ( x11-proto/xproto:0 )
 	app-arch/xz-utils:0
+	dev-lang/yasm:0
 	>=sys-devel/gettext-0.18.3:0
 	virtual/pkgconfig:0
 "
@@ -304,7 +307,6 @@ src_configure() {
 		$(use_enable cddb libcddb) \
 		$(use_enable chromaprint) \
 		$(use_enable dbus) \
-		$(use_enable dirac) \
 		$(use_enable directfb) \
 		$(use_enable directx) \
 		$(use_enable dc1394) \
@@ -321,14 +323,17 @@ src_configure() {
 		$(use_enable fluidsynth) \
 		$(use_enable fontconfig) \
 		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
 		$(use_enable gme) \
 		$(use_enable gnome gnomevfs) \
 		$(use_enable gnutls) \
 		$(use_enable growl) \
 		$(use_enable httpd) \
 		$(use_enable ieee1394 dv1394) \
-		$(use_enable ios-vout) \
+		$(use_enable ios-vout ios-vout2) \
 		$(use_enable jack) \
+		$(use_enable jpeg) \
 		$(use_enable kate) \
 		$(use_with kde kde-solid) \
 		$(use_enable libass) \
@@ -358,6 +363,7 @@ src_configure() {
 		$(use_enable neon) \
 		$(use_enable ogg) $(use_enable ogg mux_ogg) \
 		$(use_enable omxil) \
+		$(use_enable omxil omxil-vout) \
 		$(use_enable opencv) \
 		$(use_enable opengl glx) $(use_enable opengl glspectrum) \
 		$(use_enable opus) \
@@ -404,20 +410,31 @@ src_configure() {
 		$(use_enable xml libxml2) \
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coregraphicslayer-vout \
+		--disable-coverage \
+		--disable-cprof \
 		--disable-crystalhd \
 		--disable-decklink \
+		--disable-ios-audio \
 		--disable-goom \
 		--disable-kai \
 		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
 		--disable-mfx \
+		--disable-opensles \
 		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
 		--disable-shine \
 		--disable-sndio \
 		--disable-x265 \
 		--disable-vda \
-		--disable-vsxu
+		--disable-vsxu \
+		--disable-wasapi
 
-		# ^ We don't have these disables libraries in the Portage tree yet.
+		# ^ We don't have these disabled libraries in the Portage tree yet.
 }
 
 src_test() {