rpms/vlc/devel vlc-backport-freerdp.patch, NONE, 1.1 vlc.spec, 1.215, 1.216

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10320/devel

Modified Files:
	vlc.spec 
Added Files:
	vlc-backport-freerdp.patch 
Log Message:
Fix for freerdp and f22


vlc-backport-freerdp.patch:
 rdp.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE vlc-backport-freerdp.patch ---
commit 5c07f87a773153c128b3a771ed61e7915cd8fe18
Author: Vinson Lee <vlee at freedesktop.org>
Date:   Fri Feb 20 06:05:09 2015 +0000

    rdp: Support FreeRDP-1.2.0-beta1-android9
    
    Fix build errors.
    
      CC       access/librdp_plugin_la-rdp.lo
    access/rdp.c: In function ‘Open’:
    access/rdp.c:431:5: error: implicit declaration of function ‘freerdp_channels_global_init’ [-Werror=implicit-function-declaration]
         freerdp_channels_global_init();
         ^
    access/rdp.c: In function ‘Close’:
    access/rdp.c:507:5: error: implicit declaration of function ‘freerdp_channels_global_uninit’ [-Werror=implicit-function-declaration]
         freerdp_channels_global_uninit();
         ^
    
    freerdp channels global functions were removed from FreeRDP repository
    in commit 2a82684521dc8b23ae92e284e866227e5194a7bb.
    
    commit 2a82684521dc8b23ae92e284e866227e5194a7bb
    Author: Marc-André Moreau <marcandre.moreau at gmail.com>
    Date:   Wed Jun 11 16:27:31 2014 -0400
    
        channels: cleanup unused freerdp channels global functions
    
    Signed-off-by: Vinson Lee <vlee at freedesktop.org>
    Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index 1dca8ae..769ba60 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -428,7 +428,9 @@ static int Open( vlc_object_t *p_this )
     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 )
@@ -504,7 +506,9 @@ static void Close( vlc_object_t *p_this )
 
     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 );


Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- vlc.spec	16 Apr 2015 10:23:12 -0000	1.215
+++ vlc.spec	26 Apr 2015 19:10:12 -0000	1.216
@@ -32,11 +32,12 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	2.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
 Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
+Patch0:         vlc-backport-freerdp.patch
 
 BuildRequires:	desktop-file-utils
 
@@ -223,6 +224,8 @@
 ./bootstrap
 }
 
+%patch0 -p1
+
 
 %build
 
@@ -470,6 +473,9 @@
 
 
 %changelog
+* Sun Apr 26 2015 Nicolas Chauvet <kwizart at gmail.com> - 2.2.1-3
+- Fix build with freerdp for f22
+
 * Thu Apr 16 2015 Nicolas Chauvet <kwizart at gmail.com> - 2.2.1-2
 - Rebuilt for x265