diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-05-06 18:32:38 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-05-06 22:14:58 +0700 |
| commit | 45c69ef9d7bd7e40bd761d965107bced71abb8c0 (patch) | |
| tree | d4611b856aaaef3cbcdf3ad71dfb2a869a96e270 /multimedia/vlc/patch-freerdp.diff | |
| parent | 42754fa6b2c7971c7db0bdda50ce9bbc1e5b5a62 (diff) | |
| download | slackbuilds-45c69ef9d7bd7e40bd761d965107bced71abb8c0.tar.gz | |
multimedia/vlc: Downgraded to 2.1.6.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia/vlc/patch-freerdp.diff')
| -rw-r--r-- | multimedia/vlc/patch-freerdp.diff | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/multimedia/vlc/patch-freerdp.diff b/multimedia/vlc/patch-freerdp.diff new file mode 100644 index 0000000000..c1f4f23295 --- /dev/null +++ b/multimedia/vlc/patch-freerdp.diff @@ -0,0 +1,76 @@ +--- modules/access/rdp.c.orig 2013-06-24 18:00:38.000000000 +0000 ++++ modules/access/rdp.c 2014-08-14 07:20:03.000000000 +0000 +@@ -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 @@ + 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 @@ + 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 @@ + 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 -Nru vlc-2.1.5/modules/access/rtp/input.c vlc-2.2.0~pre2/modules/access/rtp/input.c |