diff options
| author | Christoph Willing <chris.willing@iinet.net.au> | 2015-02-21 09:36:31 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2015-02-21 09:36:31 +0700 |
| commit | 1c8d5e9c1253d89e159a6a7a49921c0f44a28663 (patch) | |
| tree | 6a28a26815cdaa45c5355f660c3ca2a12b53f92a /multimedia/vlc | |
| parent | 2e8c8f8889cf19cd507dff73192bc2792c16e808 (diff) | |
| download | slackbuilds-1c8d5e9c1253d89e159a6a7a49921c0f44a28663.tar.gz | |
multimedia/vlc: Patched to address interface change in freerdp.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/patch-freerdp_1_2.diff | 55 | ||||
| -rw-r--r-- | multimedia/vlc/vlc.SlackBuild | 3 |
2 files changed, 57 insertions, 1 deletions
diff --git a/multimedia/vlc/patch-freerdp_1_2.diff b/multimedia/vlc/patch-freerdp_1_2.diff new file mode 100644 index 0000000000..743501d7d2 --- /dev/null +++ b/multimedia/vlc/patch-freerdp_1_2.diff @@ -0,0 +1,55 @@ +--- modules/access/rdp.c.orig 2015-02-21 11:01:32.145593444 +1000 ++++ modules/access/rdp.c 2015-02-21 10:34:14.875061312 +1000 +@@ -83,7 +83,7 @@ + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_description( N_("RDP Remote Desktop") ) +- set_capability( "access_demux", 10 ) ++ set_capability( "access_demux", 0 ) + + add_string( CFG_PREFIX "user", NULL, RDP_USER, RDP_USER, false ) + change_safe() +@@ -233,7 +233,7 @@ + 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 ) ++#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ) + p_instance->settings->DesktopWidth, + p_instance->settings->DesktopHeight, + p_instance->settings->ColorDepth +@@ -248,7 +248,13 @@ + p_instance->update->BeginPaint = beginPaintHandler; + p_instance->update->EndPaint = endPaintHandler; + +- gdi_init( p_instance, CLRBUF_16BPP | CLRBUF_24BPP | CLRBUF_32BPP, NULL ); ++ gdi_init( p_instance, ++ CLRBUF_16BPP | ++#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ ++ !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) ++ CLRBUF_24BPP | ++#endif ++ CLRBUF_32BPP, NULL ); + + desktopResizeHandler( p_instance->context ); + return true; +@@ -422,7 +428,9 @@ + if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; + p_sys->i_frame_interval = 1000000 / p_sys->f_fps; + ++#if FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR < 2 + freerdp_channels_global_init(); ++#endif + + p_sys->p_instance = freerdp_new(); + if ( !p_sys->p_instance ) +@@ -498,7 +506,9 @@ + + freerdp_disconnect( p_sys->p_instance ); + freerdp_free( p_sys->p_instance ); ++#if 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/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 3d6c200593..22c735d0ae 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -29,7 +29,7 @@ PRGNAM=vlc VERSION=${VERSION:-2.1.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -86,6 +86,7 @@ unzip -o $CWD/$DECKLINKSDK cp -p Blackmagic\ DeckLink\ SDK\ ${DECKLINK_SDK_VERSION}/Linux/include/* decklink/include/ patch -p0 < $CWD/patch-freerdp.diff +patch -p0 < $CWD/patch-freerdp_1_2.diff patch -p0 < $CWD/patch-projectM-fontpath.diff chown -R root:root . |