version bump (ebuild and patches provided by proxied maintainer in bug #546880)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

5 files changed, 557 insertions, 16 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index d7e0f2942861..b882e869822e 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.947 2015/04/19 04:59:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.948 2015/04/19 06:30:22 yngwin Exp $
+
+*vlc-2.2.1 (19 Apr 2015)
+
+  19 Apr 2015; Ben de Groot <yngwin@gentoo.org>
+  +files/vlc-2.2.0-rdp-1.2.0.patch, +files/vlc-2.2.0-xcb_vdpau.patch,
+  +vlc-2.2.1.ebuild:
+  version bump (ebuild and patches provided by proxied maintainer in bug
+  #546880)
 
   19 Apr 2015; Ben de Groot <yngwin@gentoo.org> vlc-2.1.2.ebuild:
   Drop all keywords except alpha on 2.1.2 (bug #530254)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3db2058a01f9..dd72f5595036 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,35 +7,39 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 SHA256 5b2d4272b0258b30d1e34717ad83eb
 AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236486a885b9f64b4c80004db7964b2b931c1 SHA512 74cba8136b2abb7a78b5ee8c8b5a9b3509a4a16ff9d4f136a3a7e2d6ff634ce20e34b8d140810ac63dd6cd3115d71cbb87a6e213fb172485494e55ade1b5230a WHIRLPOOL 1d2e747f4097c7903b798d7dfd17e11de41c01e903afda0b2c766ef5d7977da32362c52e5bc41c93a1f801a93c857c08d2cee3840f76a55afe0b2a768250073e
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
 AUX vlc-2.2.0-fix-xcb.patch 732 SHA256 bee17ce12d869ba809a6b7120d0e85f26c4dbf2f0f4af950f1bd473e0677675c SHA512 7eef6285f61931b291db8d667ca8e14226bc1be63aad95cafb6a68746e85c55510b8bc6539d6a3dc5fd18587529798ac8783b05c561af005cfb4619dad5eac01 WHIRLPOOL c8a9dfa236dddc6dae51fdc35af59b80d84e0900f15d76ef16292a4fdf3100425afb7380c4ff4b597f24825d98fb61b7c69d6c64c9d81239b8dccebe92f47d61
+AUX vlc-2.2.0-rdp-1.2.0.patch 928 SHA256 139383d50c2475485af08db6dba0c0d71ebccae25300c6fdfa4a01c137facf51 SHA512 a8d3098c42e8fa5d3795077f9520dd5e734a06f9158821faafedfa40982cc5c4539585b9f964cb5769d176cc939c219cdb5961e72ddaa3e8b486c4422b3647c0 WHIRLPOOL e586ad98a11a42ffcb68d5724cf72c68bf3c57fa8cf75097915a880826767327154d34e9176e3d372c43036101af719016f3cd395a5e2eb824d63de0296a7051
+AUX vlc-2.2.0-xcb_vdpau.patch 652 SHA256 341e8c0b89549db0c747f10ec0772989f9ef9f1dfdbf244cbfdd3a0575e2a923 SHA512 2c9042b3a330dd5aa5b750728e7d2cd4ce3e04418b74a6232a0937868424fe8e87ea53cf916464874616239f2c792319bfd8730e033458a8df153be4e85c5392 WHIRLPOOL 2c27a2c28cff2382c0bfa5d40891228b1d079489b28e7319005ffdee4e19e0c4bf8e93b083d91ed375cc190989a387b935e517d7ff1b10a402aa3187f96bf36c
 AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb97097030f1d372bb81b63ef88231a17e5f237 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 WHIRLPOOL df5cfdb4ba36ccd92e79de7b913b14c5416aca0834025dc51f8178db6c88f5eecb332ae7096800607d6f7526a56c7fb94e2f593bc0c0e19f643428bcd3eb5868
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
 DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 SHA512 41162ff2dcc35edb47721c5a0f5d1346a0bcf3099c641e317ca1ce50baadeec3eef38f10355396a82e029474f6decd1e4355bbf218cadb795ccad3ff81a585bb WHIRLPOOL 83777143ef84177fffb1e034e47012bfe4ac2355883f64d3932dcf0c3edf237d858016523a886d00934da441ae2e7b635dc4111b0fb368083d4b71c43d00f695
+DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
 EBUILD vlc-2.1.2.ebuild 14601 SHA256 f93dfb4630cec9dc04885ee1818f9a81a0531a3c32931c8df1607b282181fd02 SHA512 f8dc44fa4d70b70c85bf1b4f5cad484deb62ead0612163b67ce5f7a74fbc8c24bddaebb98033032c0e67c18e0ea3edba1fd6f2760336453196bf47f765126a1d WHIRLPOOL d9b75b87254e9381c6ae19b60cc8bae60d587da5f4beff7d489124cdea3ac7d1fd2e2fb6d0446e90bb0e081ed75f1a751beda50285dea933c5d929fbfa0db638
 EBUILD vlc-2.1.5-r1.ebuild 15387 SHA256 97a50e19ac49cb4c9dcc6853fdceec04e4f00c1f856dbbcef1763852cd7c94ab SHA512 421f017215367523e62cac6ad89931449f76a78d439fb89b44e9a4088d6a199baddb4ffcef0726bcc94968540407ec993a9e560c53f38f1d547152cd17b4b3cf WHIRLPOOL cce9190e813c6b34fe8fde31061d98e526eeb61e06522978c3401b03b92095143e2d201c95e098dd03f61c7ac12d7fdc8e5a2d437e1861c9293a756fad427245
 EBUILD vlc-2.1.9999.ebuild 15308 SHA256 9ad081efa162ae762eaaef79510ce450ec12460fb11c864d25542828c387d925 SHA512 83864352df405eb3872a8fc3d546c91114e5fc7cbb74ed767d94ce4299787dde8fe8ee97c26fef1597809b524e7ce7a49dfd95774e3424e87ab64f122144de8b WHIRLPOOL c52b17f248cf34e86a4a469662d674ea8b223386a152488747b75a67bf8b0d1e0c6e4a8dfefab4aa7be5c804608a73be0eba539009d13ad31bc286efa0635620
 EBUILD vlc-2.2.0.ebuild 15582 SHA256 23e1bb3e2591b34a339773fea29a085122c36601c4b3c425456d10e526ceef4f SHA512 46db3ab721c3657a1d3aaa191fe79e173c39096b83e4181ea2c4e100039553f76d13a492d0579e70d215c25c12041ba19b4272b7c9a13d02ca717fa0aa4aed00 WHIRLPOOL d5bac1409c183bde19285db15fb38695a22bd2868ff660af79f26858ce5d75535e4a9d2f450e4b4cb11af5cf06cf6707546d1d355cdb360e35fc2d11d2214f4f
+EBUILD vlc-2.2.1.ebuild 15674 SHA256 a601577ddb1868aff3220b74fe5ac91a2c1975b136d12c54c3ba3b6ab1c5ffb7 SHA512 7b6e68cdaffad492435c28d64ede2468de97a195655f3cc42a924b5e2bab5ed05da5105a0f7e90d55bcd632bf27e704cb3fb62f201fb21e10082dd2490175471 WHIRLPOOL 46ad28be68c3f5d6e74b93fad42f5f27e3f4c951941ff3fcc6585b4f3df870ff6d7c958984b91d11a06d57a04c7116f674b65c8d8bea740008eeed2cd29cc759
 EBUILD vlc-2.2.9999.ebuild 15500 SHA256 5742f7434783bdadd32c62363cd4254cc15baf850c5b3941ad7ceea4f92a94ee SHA512 75ab0c7ca577d2f9e02ceba1a8aba7c7a70baf3e79ddf4ca30122ba42498af86c13592d274a741125278f39ce4d9a6a1202653f3cc8adfec53151172f87c2565 WHIRLPOOL da1c15a418b11f63261d4108990494a1d4cbf40c3777962470fc754ad5d55fc478e2ef3d4c4e42692939d7cbfab18623f5afded4d3f133dad9bae78a22cf984d
 EBUILD vlc-9999.ebuild 15491 SHA256 4bad4f9a24d0b96ff50c3f5d5264bccda22f985a999571f55088d1bff5f344e7 SHA512 d89daa6515edd01aae9e66bd4cfc3939f0d15b4329074d5bb846878b81c801ed520e51f3bb8a4f0e43e7b34a6b8d64bc695bec03fa6ca4e17a4e0eeeaf8eb91c WHIRLPOOL a24f4a8395e0fc87538e247d076fc6cefe01101ad2ffc471ee90c176efa4d5d6dbf656d771d08be64703e50d9953ec98569bc9ff1c78092122cacb58f9730dbd
-MISC ChangeLog 36492 SHA256 dcdfdb06ab305e3f35133eb92309f3c4a987e0818b9db6b679698b4e81a7dc71 SHA512 bbd0e0aca494323ae42d8f35aea86c0d0fcda5050de1d1fb7ce07637029e06972a2dbbeff1e6588c59d56d04f457dc82ccfddb68d937865221efd65316d88af8 WHIRLPOOL b598318db533de85a3a10b7b2857ce5449e900e1db81c10a8d8491e94d09db928e8d074436530d69538f3a2c86603233fc2e350d5716d5ab0b992dc6ce8db6d6
+MISC ChangeLog 36742 SHA256 d6f4ef765c2c47a52413fd71dfa7512a34b7033714c163d128599373acea96b2 SHA512 4208d1beff2e02ad3e4c720a17de1ee469bf7da99dfe264755a2ac08f781925f17dc60815dcff48c0ebc622e1f6b2bdef04c10c1f03e6d865ee415f24e1e3be7 WHIRLPOOL 4e1292b77931620a2d871f566de6794cab4ea0c83bb44b7bc7de3727045a3b11c044f0a1c644b2caba9432cbf669e0a3380ac0a3e737ceebe09ca5ee80bd4014
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6538 SHA256 cee37b9633b574305f8c07a19d7eee2d4362bd6de51822f98b7f150367ee5fe1 SHA512 29e8b36e5e4c89fdeb7cd3a9e9014a03855540d5b8246172febd4a5465cb50030187366c4d2c982115b08e0cd71e72e9dca7d49fd6ab8f263ad5b718df392345 WHIRLPOOL f15ca39b118e250412484a3be271f3eb2f476430e4957c77596cb11ca51752b80410e820adb559409dfd43fc631fc3262c87ac3f3ba2e4e8c53eb75c5a3baa8e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVMzYuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVM0uFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOR3gP/A9efC0L9GEigCsu0NnEaiXJ
-SFERpeY2j2dhFb2XDxCGEOCrrqCyaXHeIezu2PuGcrEdEshpJuv40f9LPNwcUJgB
-r/TDpgrUeNaHVgBsd2ZwVyHOgdGDoeyD7zwIB5UIwCM3F17PEw6PYf31BOvBluW4
-Xm08jGs6z5Tc4jo+YqSrwP5KTdNx7xaksY6WV3ell4V8vnPtunCztRiZpCqLSEc0
-XS/N2wiQOT0QyOegVjZItOtyHCcHhH8uI1R7Rw8Ff1LmHCFgDGvGM6ILJmcXIHat
-XXeG+sxBk98jnj2bMj+ODAyBkkwDbAvLTbKgHClhd0c9DjJTFuMrP4ZpXYdOArpm
-H4W1o9qnpniLPW1CHZXL1OZMr87oLNeYYIn/sjFFm7AEfAGR22ia3LtsjVOhHEN9
-sNOO0AfcDCDXgNNfqVg3GVERWyCGj4Ilk68/hc/zr8o2w7SFv75HDfcmanrxyNlX
-yYMuL386skL0l6S/Bnhy+SQiOLEIFRRGK498O6t4RjLK2hu/xYFFrTtvHs1ni8yH
-YobuGsOm3kTumDbHqmZgpuWvFfLKCTW/v8m7V6GKTaeVCtTc7Pjl+FbyaaRbmMeq
-u7XQjXqM6GWZOHBAKO9qLMUI+Wa8V0K3KimHVcqlZgY0EdT3E/QABTqhp6QxJ53Y
-Ge3KO3Sq3hySOSQHQucV
-=AcTo
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOj7wQALVbpctGAsWKe+YXmCfA5uLE
+majsnKEGDQiSa4KZJhYzdqXjbw4BpMNpMYG6cEXLVMdqNZgLpbr+4k6EughUiO3j
+Up+tu2O9CKNhSLDgwicFNMxsjuznuy1HZT7l2uDL4a/e/I7RHOwaXs95IHq57qE0
+TlnORtkRJ+HpQtG7e5vUvwYy61WCsQgpFU0NmDXKCCfTHCpMtlgyJMT5a0b2sSRY
+ye5JMT0zT5Rqg5tGS8koGQUC8nrIOdAiKpWdreumMOcsBSqotBx0ZWSXRYz0udew
+9UmDFczB5QlwFqB15BEhqDHPeEwVdGCB/plAK+csQdox595m1kqN5xeE6Wzp/tlY
+ugd85eEXHR1tbMbwUwKV1YfwwFgX4mpZ1ikpCNEpbKu5BTjKm3CaqizWjMuCR84x
+Q+Eyh6+x3LeIl5UlVBruabRegQL/g8UL1fBMv7FZYP7eCzCRVOl8SdXaselWdEMW
+KHbUxdRQ7VgYgnKkOPfABJ2jwoxXwtzzqnIiQ0Y2A7+dhEnNyeYh3aDsr6bnGBML
+fOA9pbdb+yDUcrVwkT4e/4jjwgQ/SPHOh2XuVuZ1GdC26mpRN9nUF7JuX2GdIw4C
+IzsWvFi4dwKAUzfNShcrf+zg3ZmqEOp7EIdSDVTuC1yy4srtk50soGzIlcsBHQRt
+IKI2dFq5W9frldqRx4LX
+=Ugcu
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
new file mode 100644
index 000000000000..19fc70fcc346
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch
@@ -0,0 +1,23 @@
+--- a/modules/access/rdp.c	2014-11-22 01:40:52.044973648 -0800
++++ b/modules/access/rdp.c	2014-11-22 01:36:44.291975380 -0800
+@@ -399,7 +404,9 @@
+     if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
+     p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
+ 
++#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+     freerdp_channels_global_init();
++#endif
+ 
+     p_sys->p_instance = freerdp_new();
+     if ( !p_sys->p_instance )
+@@ -475,7 +482,10 @@
+ 
+     freerdp_disconnect( p_sys->p_instance );
+     freerdp_free( p_sys->p_instance );
++
++#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2))
+     freerdp_channels_global_uninit();
++#endif
+ 
+     if ( p_sys->p_block )
+         block_Release( p_sys->p_block );
diff --git a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
new file mode 100644
index 000000000000..dec6c125af17
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch
@@ -0,0 +1,15 @@
+--- modules/hw/vdpau/Makefile.am.orig	2015-04-16 22:29:26.299342749 -0700
++++ modules/hw/vdpau/Makefile.am	2015-04-16 22:31:40.886340950 -0700
+@@ -45,6 +45,7 @@
+ libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
+ vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
+ 
++if HAVE_XCB
+ libvdpau_display_plugin_la_SOURCES = display.c
+ libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
+ libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+@@ -52,3 +53,4 @@
+ 	../../video_output/libvlc_xcb_events.la \
+ 	$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
+ vdpau_LTLIBRARIES += libvdpau_display_plugin.la
++endif
diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild
new file mode 100644
index 000000000000..c1e3b7875220
--- /dev/null
+++ b/media-video/vlc/vlc-2.2.1.ebuild
@@ -0,0 +1,491 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.1 2015/04/19 06:30:22 yngwin Exp $
+
+EAPI="5"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+
+	if [ "${PV%.9999}" != "${PV}" ] ; then
+		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
+	fi
+fi
+
+inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+fi
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-7" # vlc - vlccore
+
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm -sparc ~x86 ~x86-fbsd"
+else
+	KEYWORDS=""
+fi
+
+IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
+	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
+	growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+	+libsamplerate libtiger linsys libtar lirc live lua
+	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
+	matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
+	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+	png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
+	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+	vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi"
+
+RDEPEND="
+		!<media-video/ffmpeg-1.2:0
+		dev-libs/libgpg-error:0
+		net-dns/libidn:0
+		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+		virtual/libintl:0
+		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
+		aalib? ( media-libs/aalib:0 )
+		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
+		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
+		avcodec? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( >=media-video/libav-11:0= )
+		)
+		avformat? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( media-video/libav:0= )
+		)
+		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
+		bluray? ( >=media-libs/libbluray-0.3:0 )
+		cddb? ( >=media-libs/libcddb-1.2:0 )
+		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+		dbus? ( >=sys-apps/dbus-1.6:0 )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
+		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
+		dts? ( >=media-libs/libdca-0.0.5:0 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
+		dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
+		elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
+		faad? ( >=media-libs/faad2-2.6.1:0 )
+		fdk? ( media-libs/fdk-aac:0 )
+		flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
+		fontconfig? ( media-libs/fontconfig:1.0 )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0: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 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
+		jpeg? ( virtual/jpeg:0 )
+		kate? ( >=media-libs/libkate-0.3:0 )
+		libass? ( >=media-libs/libass-0.9.8:0 media-libs/fontconfig:1.0 )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
+		libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
+		libsamplerate? ( media-libs/libsamplerate:0 )
+		libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
+		libtiger? ( >=media-libs/libtiger-0.3.1:0 )
+		linsys? ( >=media-libs/zvbi-0.2.28:0 )
+		lirc? ( app-misc/lirc:0 )
+		live? ( >=media-plugins/live-2011.12.23:0 )
+		lua? ( >=dev-lang/lua-5.1:0 )
+		matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
+		modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
+		mp3? ( media-libs/libmad:0 )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
+		mtp? ( >=media-libs/libmtp-1:0 )
+		musepack? ( >=media-sound/musepack-tools-444:0 )
+		ncurses? ( sys-libs/ncurses:5[unicode] )
+		ogg? ( >=media-libs/libogg-1:0 )
+		opencv? ( >media-libs/opencv-2:0 )
+		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
+		opus? ( >=media-libs/opus-1.0.3:0 )
+		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
+		postproc? (
+			!libav? ( >=media-video/ffmpeg-1.2:0= )
+			libav? ( media-libs/libpostproc:0= )
+		)
+		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
+		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
+		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
+		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
+		rdp? ( >=net-misc/freerdp-1.0.1:0= )
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
+		sdl? ( >=media-libs/libsdl-1.2.10:0
+			sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) )
+		sftp? ( net-libs/libssh2:0 )
+		shout? ( >=media-libs/libshout-2.1:0 )
+		sid? ( media-libs/libsidplay:2 )
+		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
+		speex? ( media-libs/speex:0 )
+		svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
+		swscale? (
+			!libav? ( media-video/ffmpeg:0= )
+			libav? ( media-video/libav:0= )
+		)
+		taglib? ( >=media-libs/taglib-1.9:0 sys-libs/zlib:0 )
+		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
+		tremor? ( media-libs/tremor:0 )
+		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+			!fontconfig? ( media-fonts/dejavu:0 ) )
+		twolame? ( media-sound/twolame:0 )
+		udev? ( >=virtual/udev-142:0 )
+		upnp? ( net-libs/libupnp:0 )
+		v4l? ( media-libs/libv4l:0 )
+		vaapi? (
+			x11-libs/libva:0[X,drm]
+			!libav? ( media-video/ffmpeg:0=[vaapi] )
+			libav? ( media-video/libav:0=[vaapi] )
+		)
+		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )"
+
+# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
+# thus we'll have to wait for a new release there.
+RDEPEND="${RDEPEND}
+		vdpau? (
+			>=x11-libs/libvdpau-0.6:0
+			!libav? ( >=media-video/ffmpeg-1.2:0= )
+			libav? ( >=media-video/libav-10:0= )
+		)
+		vnc? ( >=net-libs/libvncserver-0.9.9:0 )
+		vorbis? ( >=media-libs/libvorbis-1.1:0 )
+		vpx? ( media-libs/libvpx:0 )
+		X? ( x11-libs/libX11:0 )
+		x264? ( >=media-libs/x264-0.0.20090923:0= )
+		x265? ( media-libs/x265:0= )
+		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
+		xml? ( >=dev-libs/libxml2-2.5:2 )
+		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+"
+
+DEPEND="${RDEPEND}
+	kde? ( >=kde-base/kdelibs-4:4 )
+	xcb? ( x11-proto/xproto:0 )
+	app-arch/xz-utils:0
+	x86?   ( dev-lang/yasm:* )
+	amd64? ( dev-lang/yasm:* )
+	>=sys-devel/gettext-0.18.3:*
+	virtual/pkgconfig:*
+"
+
+REQUIRED_USE="
+	aalib? ( X )
+	bidi? ( truetype )
+	cddb? ( cdda )
+	dvb? ( dvbpsi )
+	dxva2? ( avcodec )
+	ffmpeg? ( avcodec avformat swscale )
+	fontconfig? ( truetype )
+	gnutls? ( gcrypt )
+	httpd? ( lua )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	qt4? ( X !qt5 )
+	qt5? ( X !qt4 )
+	sdl? ( X )
+	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	vaapi? ( avcodec X )
+	vlm? ( encode )
+	xv? ( xcb )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" && "$(tc-getCC)" == *"gcc"* ]] ; then
+		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
+			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
+		fi
+	fi
+}
+
+src_unpack() {
+	if [ "${PV%9999}" != "${PV}" ] ; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
+	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
+	#
+	# config.h:792: warning: ignoring #pragma STDC FENV_ACCESS [-Wunknown-pragmas]
+	# config.h:793: warning: ignoring #pragma STDC FP_CONTRACT [-Wunknown-pragmas]
+	#
+	# http://gcc.gnu.org/c99status.html
+	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
+		sed -i 's/ifndef __FAST_MATH__/if 0/g' configure.ac || die
+	fi
+
+	# Bootstrap when we are on a git checkout.
+	if [[ "${PV%9999}" != "${PV}" ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm -f m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Fix build system mistake.
+	epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
+
+	# Patch up incompatibilities and reconfigure autotools.
+	epatch "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch
+
+	# Patch for bug 542414
+	epatch "${FILESDIR}"/${PN}-2.2.0-rdp-1.2.0.patch
+
+	# Patch for bug 541928
+	epatch "${FILESDIR}"/${PN}-2.2.0-xcb_vdpau.patch
+
+	# Fix up broken audio when skipping using a fixed reversed bisected commit.
+	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	epatch_user
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+
+	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
+	# Setting QT_SELECT environment variable will enforce correct binaries.
+	if use qt4; then
+		export QT_SELECT=qt4
+	elif use qt5; then
+		export QT_SELECT=qt5
+	fi
+}
+
+src_configure() {
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
+	# Needs libresid-builder from libsidplay:2 which is in another directory...
+	# FIXME!
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use projectm ; then
+		local dejavu="/usr/share/fonts/dejavu/"
+		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
+				--with-default-font-family=Sans \
+				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+				--with-default-monospace-font-family=Monospace"
+	fi
+
+	local qt_flag=""
+	if use qt4 || use qt5 ; then
+		qt_flag="--enable-qt"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-vlc \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--disable-optimizations \
+		--disable-update-check \
+		--enable-fast-install \
+		--enable-screen \
+		$(use_enable a52) \
+		$(use_enable aalib aa) \
+		$(use_enable alsa) \
+		$(use_enable altivec) \
+		$(use_enable atmo) \
+		$(use_enable audioqueue) \
+		$(use_enable avahi bonjour) \
+		$(use_enable avcodec) \
+		$(use_enable avformat) \
+		$(use_enable bidi fribidi) \
+		$(use_enable bluray) \
+		$(use_enable cdda vcd) \
+		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
+		$(use_enable dbus) \
+		$(use_enable directfb) \
+		$(use_enable directx) \
+		$(use_enable dc1394) \
+		$(use_enable debug) \
+		$(use_enable dts dca) \
+		$(use_enable dvbpsi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
+		$(use_enable dxva2) \
+		$(use_enable encode sout) \
+		$(use_enable faad) \
+		$(use_enable fdk fdkaac) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable fontconfig) \
+		$(use_enable gcrypt libgcrypt) \
+		$(use_enable gme) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable gnutls) \
+		$(use_enable growl) \
+		$(use_enable httpd) \
+		$(use_enable ieee1394 dv1394) \
+		$(use_enable jack) \
+		$(use_enable jpeg) \
+		$(use_enable kate) \
+		$(use_with kde kde-solid) \
+		$(use_enable libass) \
+		$(use_enable libcaca caca) \
+		$(use_enable libnotify notify) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable libtar) \
+		$(use_enable libtiger tiger) \
+		$(use_enable linsys) \
+		$(use_enable lirc) \
+		$(use_enable live live555) \
+		$(use_enable lua) \
+		$(use_enable macosx-dialog-provider) \
+		$(use_enable macosx-eyetv) \
+		$(use_enable macosx-qtkit) \
+		$(use_enable macosx-quartztext) \
+		$(use_enable matroska mkv) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable modplug mod) \
+		$(use_enable mp3 mad) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable mtp) \
+		$(use_enable musepack mpc) \
+		$(use_enable ncurses) \
+		$(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) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable png) \
+		$(use_enable postproc) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		${qt_flag} \
+		$(use_enable rdp freerdp) \
+		$(use_enable rtsp realrtsp) \
+		$(use_enable run-as-root) \
+		$(use_enable samba smbclient) \
+		$(use_enable schroedinger) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable sid) \
+		$(use_enable sftp) \
+		$(use_enable shout) \
+		$(use_enable skins skins2) \
+		$(use_enable speex) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable svg) \
+		$(use_enable svg svgdec) \
+		$(use_enable swscale) \
+		$(use_enable taglib) \
+		$(use_enable theora) \
+		$(use_enable tremor) \
+		$(use_enable truetype freetype) \
+		$(use_enable twolame) \
+		$(use_enable udev) \
+		$(use_enable upnp) \
+		$(use_enable v4l v4l2) \
+		$(use_enable vaapi libva) \
+		$(use_enable vcdx) \
+		$(use_enable vdpau) \
+		$(use_enable vlm) \
+		$(use_enable vnc) \
+		$(use_enable vorbis) \
+		$(use_enable vpx) \
+		$(use_enable wma-fixed) \
+		$(use_with X x) \
+		$(use_enable x264) \
+		$(use_enable x265) \
+		$(use_enable xcb) \
+		$(use_enable xml libxml2) \
+		$(use_enable xv xvideo) \
+		$(use_enable zvbi) $(use_enable !zvbi telx) \
+		--disable-asdcp \
+		--disable-coverage \
+		--disable-cprof \
+		--disable-crystalhd \
+		--disable-decklink \
+		--disable-gles1 \
+		--disable-gles2 \
+		--disable-goom \
+		--disable-kai \
+		--disable-kva \
+		--disable-maintainer-mode \
+		--disable-merge-ffmpeg \
+		--disable-mfx \
+		--disable-mmal-codec \
+		--disable-mmal-vout \
+		--disable-opensles \
+		--disable-oss \
+		--disable-quicktime \
+		--disable-rpi-omxil \
+		--disable-shine \
+		--disable-sndio \
+		--disable-vda \
+		--disable-vsxu \
+		--disable-wasapi
+
+		# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
+	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
+}
+
+src_test() {
+	Xemake check-TESTS
+}
+
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
+
+src_install() {
+	default
+
+	# Punt useless libtool's .la files
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+}