Updated 9999 in a first preparation of the 2.1.0 version bump; switched to git-r3, moved bootstrap to src_prepare, small cleanup, added USE flags "chromaprint,opencv,rdp,sftp,vnc" and their respective dependencies (exceptions: rdp --> freerdp, sftp --> libssh2), made unpacking work for non-9999 versions, removed gcc warnings for missing pragmas in gcc C99 to shorten build log, fix detection of git checkout, revised freetype fonts patch, support newer freerdp and be compatibility with libva 1.2.1, disable "decklink,goom,mfx,vxsu" which are not (yet) in the Portage tree. Updated metadata.xml to document new USE flags. More changes and testing will follow.

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

7 files changed, 167 insertions, 30 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f69953e9e5b4..4aa41afe26cd 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.853 2013/10/20 09:56:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.854 2013/10/21 01:15:02 tomwij Exp $
+
+  21 Oct 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/vlc-2.1.0-freetype-proper-default-font.patch,
+  +files/vlc-2.1.0-libva-1.2.1-compat.patch, +files/vlc-2.1.0-newer-rdp.patch,
+  metadata.xml, vlc-9999.ebuild:
+  Updated 9999 in a first preparation of the 2.1.0 version bump; switched to
+  git-r3, moved bootstrap to src_prepare, small cleanup, added USE flags
+  "chromaprint,opencv,rdp,sftp,vnc" and their respective dependencies
+  (exceptions: rdp --> freerdp, sftp --> libssh2), made unpacking work for
+  non-9999 versions, removed gcc warnings for missing pragmas in gcc C99 to
+  shorten build log, fix detection of git checkout, revised freetype fonts
+  patch, support newer freerdp and be compatibility with libva 1.2.1, disable
+  "decklink,goom,mfx,vxsu" which are not (yet) in the Portage tree. Updated
+  metadata.xml to document new USE flags. More changes and testing will follow.
 
   20 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Added myself as primary maintainer to the metadata, as per aballier's gentoo-
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 394531b24a13..e907e0feeaa2 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vlc-2.1.0-freetype-proper-default-font.patch 838 SHA256 05fca1539675c8ea853dc0a011fed9ebe55dcd84bcca04cee49dda6c24205ccd SHA512 ba1c6dac7576db6cbb2b6eefdbb72c0a851941dee3da7d4b6602335cd3cc2ef10c73e2def34e81c454bd98569f5da24d5d8d040be16f0c66fefbf87a6955c60b WHIRLPOOL 97708d142903494b141da9e66f94a8c4f07e5f177728457f75aef0c23fb368d8aa263a7c3ebec6b43e5949b3ce5d3fb89c4c4c395f48b4812ee9001eaa8314f3
+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
 DIST vlc-2.0.5.tar.xz 18369292 SHA256 dff9eb00861bcd9f8446ff5cedbd3c5fd2bed460e6bfa84bd9e01f750ed96b6e SHA512 eff8146e99f819f49bf9875e4ce0bb562fca46bbf68cd7d2e2121e86d12c8b4ce02bf8fb024910f7d5742abec90583bba45eb2301156ed0418ef76952345d49e WHIRLPOOL bfef0e9adaeb520e709ce34d9a2057a26f302c657b1f89a2e655b2f6b9ad77a4ffcd0ee673549d617ff724f098116f128e13f36228a306670c85375ed9d01038
 DIST vlc-2.0.6.tar.xz 18619836 SHA256 31cc98035e2ce36c71a8f105aa5a87e3d8b5e206a0b3f7208c5ced407cbe1963 SHA512 80793305f7e0e48c99be99adfd85d699deaff53184f740b7624cdc9cad106b7c70f1d221e26c1362a1d1e5b02b861a1289e21a3af8a4c5ae3dfc316c67f15e74 WHIRLPOOL 04d2ff943d59979e25707aeab8a4157a3417b604ddf4d7116a6affe235afcd24fede3c49fea15b2b54784f9716b6376aae753b8b5b89f65e471d1fe11bfa728d
 DIST vlc-2.0.7.tar.xz 18538256 SHA256 243107d59e4bd0b942cb4ce10292eab8233394f8109ff4fde44e64d0ee745314 SHA512 6e8e55e40425cc9d48a174374a6b690f50d0a7cfed9a1b253786c9e7e52658fcd4feda94a5d4f66c58260b517248041b3f393af5171a42bf3a3e1475828b1ab2 WHIRLPOOL 7524f518a8c4575ac417261857326dcc6a2787cafd09f64a181fd597358b04433be09a4f418eb1186bb093ef467bb4de75f809721c392d60c117e1eefa0cce48
@@ -9,18 +12,18 @@ EBUILD vlc-2.0.5.ebuild 10964 SHA256 a16425b3ac14d440e2929a5bc9cabd15e3ef23f1d3d
 EBUILD vlc-2.0.6.ebuild 11027 SHA256 04bbf069ffbfdbcc82afb16192003cfe0c0453a5e14eb2473c9199675c6ef4ad SHA512 cf577b8824ba8414e9c9ab263d5e97e78b7d836f79b032871b2ad9efecac670d0d4f724327964c50db548aacc943930107f41a4ff211c7c727931c3881554fd9 WHIRLPOOL e82ba709ec6f764fa589fb1d182e3fbfdd097d663deaf8628d2fa4f2f9c317f1d711fa67a990768df0d8bfd04f1b176e52bc17975a0a254d23ad1178a05f1e85
 EBUILD vlc-2.0.7.ebuild 11017 SHA256 889c22514ff968c2d89637a2b207ebb41e98e44b4384956be850bbf42083952a SHA512 681039b0b1c1f3ac7ea27c21e81100d23f7fe726d060220c6c9a86ef454dfb551450e3a097063391b88b5c00b008421723d8ec84de6901ed4b3675df009a37e0 WHIRLPOOL 3bd88ccc00e6db6e5eeff3186b08873ecc38743393c7978091ffce446a975a6fdfe2801f918f8d1a5101f0b07213d0eebd34dd84150aabfd6cf0401ea9d536df
 EBUILD vlc-2.0.9999.ebuild 10801 SHA256 41eff317fa08d5a0e2fa5d6fa0cb75fb1a2ed9dc5c4b70c675821bef968b7c70 SHA512 7076090ce2aa458b040bac489f9a3e96244a45b65d2e0cd56ec78f43e7dd3ed5c06526b9909ccc78f98ac32300adf5a433e99934296cff7ec0fd4e8f4b142c19 WHIRLPOOL e7b8104fa83682f65c2be25bceb129c451661647bb38a3f8ae8ba7e2e79e412a5dfbc02b7001a2a55b2f66ddde5cf83ad6b8516d54310c3ccf61e3b78957541c
-EBUILD vlc-9999.ebuild 10651 SHA256 523ef6685afa539e428e0410f92338a41250a6e13501a0349d1d4c8672c99deb SHA512 7bdee36455057a6a61b99cbc105d10c1ac4815bc89493c6d3b4eeb359b71984b350c939eb9627f5ef2443ee79facd3da0f0efce2cf41c68e29ff365343b7a742 WHIRLPOOL 659b8e8d46dda360dcf445a1a89213ea1c02f2a93dd7253d511ace6a2c1a348d24099baf1ae44d167bbf81afca4b893e12588555609d38e86f98fcde0cb8af26
-MISC ChangeLog 12102 SHA256 9bc666499b0d1238f8757f4af3b7adceb3d2b21fff8ee8cad98aad1e5590debd SHA512 a8d5bf5008b3d0ccde9542cf986fe1efbe39aefa7b03857bf3a51e5c7c8a0d81d8fb750d66109292be2461f164b701af07468491d63e95464a5765109581dab6 WHIRLPOOL 991637e97e9c814a96ad86f6eacc0a1b2aeaf8eb28f168c1f1b368b7955e31101d7644eeeb2ac1fb2147deab7281db4a3ba56f0c0893f228f6e48bc2959759a9
+EBUILD vlc-9999.ebuild 12014 SHA256 67e7dbd0fe7b4c3a7f2c904df519eebff4a12ebc3b474c7ce25f3f1313f97970 SHA512 8f9d1a96ac91fcba6af02a0e953e30e92ea2f633b7afd21faac9c7481803233eb67c9241a1be65af8866613cb9254802e47af604635c8d3b28f0e6ab1d5a563f WHIRLPOOL b07f95130f7c2a70b348510b7f0346129aa50786ad356d2fdcaad13408a56f4d560c2018845b5c73a7ac6d4b91e8419db731c246be96f07e8aa7ddb423856bb9
+MISC ChangeLog 12997 SHA256 1f455199e89de0ba6f4ab6049713a1daae64cc0a4842a76f15923060f90a3182 SHA512 4a6902826912164ab7b19dd9519e74099087091026ee7f81c47ca7be7e74285a7759dfac5a2e2e85aaca6adf7d819b5a962b15b92a10c0d1d2c62debc54bfda2 WHIRLPOOL 84d36582c727d7f0932ec606f22390a3f97b539331c10d55dc07bfed18e3b6c94709e3661bd8c72ff624ad7c14083fc197f160e653e6c2b414aad2f3d6d1cde8
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
-MISC metadata.xml 6027 SHA256 4cb421b1d5ffe5f96e3a95e14451434da267b4a912e17c8d0c71a5a995560514 SHA512 cc1b677a12c7445c4faad153d86f22c00c48811137d57ca3b087ce49a33d09c348d43ffabb0407b07b85e8ee7a9575273d08813c26f0d88ec765554ab3d071fc WHIRLPOOL b7514d879fcfbfb50c782b06cc27d8085eeed57929f8e130013bd701a6e09d251fe3dfec0bdb829b07d6159b650a054caa18be0d1fa08d4e3b90387976140a47
+MISC metadata.xml 6371 SHA256 864d9edda9a5ebb98c975b6d23322a17115a892c65352f788e6c0dbdfd7c1a0a SHA512 387e35dfef77ee548e7c613f86545268316f04a73d5df47969376493f9ac944a2c74afdc7080fd3e51d015e71f298860227cd8c424b36da145634bfcfbfb4133 WHIRLPOOL 937c67305573072ded7154ffec29898115dc38e7a47528832a8c239865f97232821c454ca5fac008a1735a636f10eb244ba9b285a112b44559fb31c0e3bcdbbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSY6iyAAoJEJWyH81tNOV9Yq8IAMXFb3wpQ+g0ojCiA5wV7/nY
-lM4N2Kmg37hZY94wnwTAs0olSI0MYahNo0Xrk8J3nR5npuV4Lfkk4A8fVc4MwZR9
-3zerwQuYUtMBlOdWo4cE74H4CltLCrXvDI/UVLZLLWGfJfna1qwcZmsShd+fc1Gp
-g3Sp1LsbLupKZov0Qy0S7Fte94jVMT3exU7liLApYx/PBTuAh5gD0g5lZ/zFIbsX
-C2xR08TMbYqDADk67KxkqcrIyqs1/dPJ5KC159s242Lw8JCQ49H2MW/e4g0vebrd
-oUb3MeGaN3XnQMYVrDYKoYnZMrtD0rP5argctq49TfKM9lvMDUbYmgRoiZ/RXK8=
-=vEym
+iQEcBAEBCAAGBQJSZIAPAAoJEJWyH81tNOV9r0kH/jL28zFnY065/bSWnDDQB+Ff
+M+pzhi7KWbkDVQRAKdeLsU1Ezb8Yoq2F9QoAZFIBiNxQJZHe+qcPWPKpVMJr555D
+2J+gyHW2uRjCzQEYmf2ke2iWj5ppOKOwwN4kdOnqXkaLJ9PQqmk0E8ePT2+uOUZO
+QlzsuOiX6p4WcpF+KIXbCSTqm5OdcUWiXfy/KDZhJce7rhLT7GU4CUM5OXWkPg4J
+W2N5nD+mZjA5JRUicLExwQE2q+iV8mZjaZLGCrWVUm445+oK0MXum0EDnp0IoLFF
+Z/nolgj/TaIhgkDLYs7I4tUA1cfByyJGtOoXjCpVxDHfzR4Fw7T9Szm0WrbKeEw=
+=0PUh
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/vlc-2.1.0-freetype-proper-default-font.patch b/media-video/vlc/files/vlc-2.1.0-freetype-proper-default-font.patch
new file mode 100644
index 000000000000..37e95fe6627a
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-freetype-proper-default-font.patch
@@ -0,0 +1,17 @@
+--- a/modules/text_renderer/freetype.c
++++ b/modules/text_renderer/freetype.c
+@@ -67,10 +67,10 @@
+ # define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/system/fonts/DroidSansMono.ttf"
+ # define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Droid Sans Mono"
+ #else
+-# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+-# define SYSTEM_DEFAULT_FAMILY "Serif Bold"
+-# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
+-# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "Monospace"
++# define SYSTEM_DEFAULT_FONT_FILE "/usr/share/fonts/dejavu/DejaVuSans.ttf"
++# define SYSTEM_DEFAULT_FAMILY "DejaVu Sans"
++# define SYSTEM_DEFAULT_MONOSPACE_FONT_FILE "/usr/share/fonts/dejavu/DejaVuSansMono.ttf"
++# define SYSTEM_DEFAULT_MONOSPACE_FAMILY "DejaVu Sans Mono"
+ #endif
+ 
+ #ifndef DEFAULT_FONT_FILE
diff --git a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
new file mode 100644
index 000000000000..db73a4ee42f5
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/vaapi.c
++++ b/modules/codec/avcodec/vaapi.c
+@@ -36,6 +36,9 @@
+ #include <libavcodec/vaapi.h>
+ #include <X11/Xlib.h>
+ #include <va/va_x11.h>
++#if VA_MINOR_VERSION >= 34
++# include <va/va_compat.h>
++#endif
+ 
+ #include "avcodec.h"
+ #include "va.h"
\ No newline at end of file
diff --git a/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch b/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
new file mode 100644
index 000000000000..aa1957a7150a
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
@@ -0,0 +1,47 @@
+--- a/modules/access/rdp.c
++++ b/modules/access/rdp.c
+@@ -198,15 +198,15 @@
+     demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
+ 
+     /* Configure connexion */
+-    p_instance->settings->sw_gdi = true; /* render in buffer */
+-    p_instance->settings->fullscreen = true;
+-    p_instance->settings->hostname = strdup( p_sys->psz_hostname );
+-    p_instance->settings->username =
++    p_instance->settings->SoftwareGdi = true; /* render in buffer */
++    p_instance->settings->Fullscreen = true;
++    p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname );
++    p_instance->settings->Username =
+             var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" );
+-    p_instance->settings->password =
++    p_instance->settings->Password =
+             var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" );
+-    p_instance->settings->port = p_sys->i_port;
+-    p_instance->settings->encryption =
++    p_instance->settings->ServerPort = p_sys->i_port;
++    p_instance->settings->EncryptionMethods =
+             var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" );
+ 
+     return true;
+@@ -217,9 +217,9 @@
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
+ 
+     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
+-             p_instance->settings->width,
+-             p_instance->settings->height,
+-             p_instance->settings->color_depth );
++             p_instance->settings->DesktopWidth,
++             p_instance->settings->DesktopHeight,
++             p_instance->settings->ColorDepth );
+ 
+     p_instance->update->DesktopResize = desktopResizeHandler;
+     p_instance->update->BeginPaint = beginPaintHandler;
+@@ -415,7 +415,7 @@
+     p_sys->p_instance->Authenticate = authenticateHandler;
+ 
+     /* Set up context handlers and let it be allocated */
+-    p_sys->p_instance->context_size = sizeof( vlcrdp_context_t );
++    p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t );
+     freerdp_context_new( p_sys->p_instance );
+ 
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 52d591897169..54ba926180cf 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="avcodec">Enables libavcodec support for video/audio	encoding/decoding. libavcodec is part of FFmpeg.</flag>
 	<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
 	<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
+	<flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
     <flag name="dc1394">Enables IIDC cameras support.</flag>
     <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
 	<flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
@@ -45,16 +46,19 @@
 	<flag name="media-library">Build the (sqlite based) media library.</flag>
 	<flag name="omxil">Enables OpenMAX Integration Layer codec module.</flag>
     <flag name="optimisememory">Enable optimisation for memory rather than performance.</flag>
+    <flag name="opencv">Enabled OpenCV (computer vision) filter module.</flag>
 	<flag name="opus">Support opus decoding via libopus.</flag>
 	<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
     <flag name="projectm">Enables the projectM visualization plugin.</flag>
     <flag name="pvr">Enables PVR cards access module.</flag>
     <flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend. It is now the most up-to-date graphical interface available.</flag>
+    <flag name="rdp">Enables freerdp for RDP/Remote Desktop client support</flag>
     <flag name="rtsp">Enables real audio and RTSP modules.</flag>
     <flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
     <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="sid">Adds support for playing C64 SID files through <pkg>media-libs/libsidplay-2</pkg>.</flag>
     <flag name="sdl-image">Enables sdl image video decoder (depends on sdl)</flag>
+    <flag name="sftp">Enables libssh2 to support SFTP file transfer.</flag>
     <flag name="shine">Enables shine fixed point mp3 encoder.</flag>
     <flag name="shout">Enables libshout output.</flag>
     <flag name="skins">Enables support for the skins2 interface.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 721a71ca2164..7b8f481e3f08 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 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.191 2013/09/20 23:30:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.192 2013/10/21 01:15:02 tomwij Exp $
 
 EAPI="5"
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git-2
-	EGIT_BOOTSTRAP="bootstrap"
+	SCM="git-r3"
+
 	if [ "${PV%.9999}" != "${PV}" ] ; then
 		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
 	else
@@ -32,9 +32,6 @@ else
 	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 fi
 
-# SRC_URI="${SRC_URI}
-#	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 
@@ -44,20 +41,21 @@ else
 	KEYWORDS=""
 fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
-	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac
+	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug dirac
 	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
 	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack 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
-	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png
-	+postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger
-	sdl sdl-image shine shout sid skins speex sse svg +swscale
-	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
-	wma-fixed +X x264 +xcb xml xv zvbi"
+	mtp musepack ncurses neon ogg omxil opencv opengl optimisememory oss png
+	+postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba schroedinger
+	sdl sdl-image sftp shine shout sid skins speex sse svg +swscale
+	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vnc vorbis
+	waveout wma-fixed +X x264 +xcb xml xv zvbi"
 
 RDEPEND="
+		>=sys-devel/gettext-0.18.3
 		>=sys-libs/zlib-1.2.5.1-r2[minizip]
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
 		aalib? ( media-libs/aalib )
@@ -69,6 +67,7 @@ RDEPEND="
 		bidi? ( >=dev-libs/fribidi-0.10.4 )
 		bluray? ( >=media-libs/libbluray-0.2.1 )
 		cddb? ( >=media-libs/libcddb-1.2.0 )
+		chromaprint? ( >=media-libs/chromaprint-0.6 )
 		dbus? ( >=sys-apps/dbus-1.0.2 )
 		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
 		dirac? ( >=media-video/dirac-0.10.0 )
@@ -108,16 +107,19 @@ RDEPEND="
 		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses[unicode] )
 		ogg? ( media-libs/libogg )
+		opencv? ( >=media-libs/opencv-2.0 )
 		opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 )
 		png? ( media-libs/libpng sys-libs/zlib )
 		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
 		projectm? ( media-libs/libprojectm media-fonts/dejavu )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
+		rdp? ( net-misc/freerdp )
 		samba? ( >=net-fs/samba-3.4.6[smbclient] )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
 		sdl? ( >=media-libs/libsdl-1.2.8
 			sdl-image? ( media-libs/sdl-image sys-libs/zlib	) )
+		sftp? ( net-libs/libssh2 )
 		shout? ( media-libs/libshout )
 		sid? ( media-libs/libsidplay:2 )
 		skins? ( x11-libs/libXext x11-libs/libXpm x11-libs/libXinerama )
@@ -135,6 +137,7 @@ RDEPEND="
 		vaapi? ( x11-libs/libva )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
+		vnc? ( >=net-libs/libvncserver-0.9.9 )
 		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923:= )
 		xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 )
@@ -143,10 +146,10 @@ RDEPEND="
 		"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.18.3
 	kde? ( >=kde-base/kdelibs-4 )
 	xcb? ( x11-proto/xproto )
 	app-arch/xz-utils
-	>=sys-devel/gettext-0.18.3
 	virtual/pkgconfig"
 
 REQUIRED_USE="
@@ -175,24 +178,51 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	if [ "${PV%9999}" != "${PV}" ] ; then
-		git-2_src_unpack
+		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
+	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
+
+	# Patch up problems and reconfigure autotools.
+	epatch "${FILESDIR}"/${PN}-2.1.0-freetype-proper-default-font.patch
+	epatch "${FILESDIR}"/${PN}-2.1.0-newer-rdp.patch
+	epatch "${FILESDIR}"/${PN}-2.1.0-libva-1.2.1-compat.patch
 
-#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 	eautoreconf
 }
 
 src_configure() {
-	# needs libresid-builder from libsidplay:2 which is in another directory...
+	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	use sid && append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
 
-	if use truetype || use projectm; then
+	# Need to check if this works and is correct so we can drop the patch above.
+	# TODO!
+	if use truetype || use projectm ; then
 		local dejavu="/usr/share/fonts/dejavu/"
 		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
 				--with-default-font-family=Sans \
@@ -217,6 +247,7 @@ src_configure() {
 		$(use_enable bluray) \
 		$(use_enable cdda vcd) \
 		$(use_enable cddb libcddb) \
+		$(use_enable chromaprint) \
 		$(use_enable dbus) \
 		$(use_enable dirac) \
 		$(use_enable directfb) \
@@ -270,6 +301,7 @@ src_configure() {
 		$(use_enable neon) \
 		$(use_enable ogg) $(use_enable ogg mux_ogg) \
 		$(use_enable omxil) \
+		$(use_enable opencv) \
 		$(use_enable opengl glx) \
 		$(use_enable optimisememory optimize-memory) \
 		$(use_enable oss) \
@@ -278,6 +310,7 @@ src_configure() {
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable qt4 qt) \
+		$(use_enable rdp freerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
 		$(use_enable samba smbclient) \
@@ -302,6 +335,7 @@ src_configure() {
 		$(use_enable vaapi libva) \
 		$(use_enable vcdx) \
 		$(use_enable vlm) \
+		$(use_enable vnc) \
 		$(use_enable vorbis) \
 		$(use_enable waveout) \
 		$(use_enable wma-fixed) \
@@ -312,7 +346,13 @@ src_configure() {
 		$(use_enable xv xvideo) \
 		$(use_enable zvbi) $(use_enable !zvbi telx) \
 		--disable-optimizations \
-		--enable-fast-install
+		--enable-fast-install \
+		--disable-decklink \
+		--disable-goom \
+		--disable-mfx \
+		--disable-vsxu
+
+		# ^ We don't have decklink, goom, mfx or vsxu in the Portage tree.
 }
 
 src_install() {