[SCM] vlc/master: Add upstream patch to support FreeRDP 1.1.0-beta2 API

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 53de03f573ac0c25bf50848b5f01c61ca8cd5c00
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Aug 15 22:27:21 2014 +0200

    Add upstream patch to support FreeRDP 1.1.0-beta2 API
    
    Closes: #757951

diff --git a/debian/patches/freerdp-1.1.0-beta2-API.patch b/debian/patches/freerdp-1.1.0-beta2-API.patch
new file mode 100644
index 0000000..0c8ed1c
--- /dev/null
+++ b/debian/patches/freerdp-1.1.0-beta2-API.patch
@@ -0,0 +1,84 @@
+Description: support FreeRDP 1.1.0-beta2 API
+Origin: upstream,
+ http://git.videolan.org/?p=vlc/vlc-2.2.git;a=commit;h=14c90980a039175db436beb65419b8146c056db5
+Bug-Debian: https://bugs.debian.org/757951
+Last-Update: 2014-08-15
+
+diff --git a/modules/access/rdp.c b/modules/access/rdp.c
+index 8b6d12d..2011cfb 100644
+--- a/modules/access/rdp.c
++++ b/modules/access/rdp.c
+@@ -41,6 +41,22 @@
+ #include <freerdp/channels/channels.h>
+ #include <freerdp/gdi/gdi.h>
+ 
++#if !defined(FREERDP_INTERFACE_VERSION)
++# include <freerdp/version.h>
++#endif
++
++#if !defined(FREERDP_VERSION_MAJOR) || \
++    (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ))
++# define SoftwareGdi sw_gdi
++# define Fullscreen fullscreen
++# define ServerHostname hostname
++# define Username username
++# define Password password
++# define ServerPort port
++# define EncryptionMethods encryption
++# define ContextSize context_size
++#endif
++
+ #include <errno.h>
+ #ifdef HAVE_POLL
+ # include <poll.h>
+@@ -198,15 +214,15 @@ static bool preConnectHandler( freerdp *p_instance )
+     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 +233,16 @@ static bool postConnectHandler( freerdp *p_instance )
+     vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
+ 
+     msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
++#if (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )
++             p_instance->settings->DesktopWidth,
++             p_instance->settings->DesktopHeight,
++             p_instance->settings->ColorDepth
++#else
+              p_instance->settings->width,
+              p_instance->settings->height,
+-             p_instance->settings->color_depth );
++             p_instance->settings->color_depth
++#endif
++             );
+ 
+     p_instance->update->DesktopResize = desktopResizeHandler;
+     p_instance->update->BeginPaint = beginPaintHandler;
+@@ -415,7 +438,7 @@ static int Open( vlc_object_t *p_this )
+     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/debian/patches/series b/debian/patches/series
index 106e947..3e87aa3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 pnap-grammar.patch
 hurd.patch
+freerdp-1.1.0-beta2-API.patch

-- 
VLC media player packaging