From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 22 Apr 2016 14:54:09 -0700 Subject: [PATCH] handle new freerdp pkgconfig name freerdp has now changed its pkgconfig name to 'freerdp2' - https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming we can build against both 1 and 2, we should handle both names. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 585c016..362951d 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"]) # Whether to enable support for RDP. RDP_DEPS="freerdp x11" +RDP_2_DEPS="freerdp2 x11" AC_ARG_ENABLE([rdp], [AS_HELP_STRING([--disable-rdp], [Disable Remote Desktop Protocol (RDP) support])]) @@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], [have_rdp=yes PKG_CHECK_EXISTS(freerdp >= 1.1, [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], - [have_rdp=no])], + [PKG_CHECK_EXISTS([$RDP_2_DEPS], + [have_rdp=yes + RDP_DEPS=$RDP_2_DEPS + AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], [have_rdp=no]) AS_IF([test "x$have_rdp" = "xyes"], From a0822458b0c262520098c84d60fb7446aea098e0 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Mon, 5 Dec 2016 15:31:43 +0800 Subject: [PATCH] Fix build with recent FreeRDP git snapshot FreeRDP commit df35c13 removes CLRBUF_32BPP macro and changes the way to call gdi_init function. As FreeRDP doesn't bump its version number after this API break, we can only use CLRBUF_32BPP macro itself to check for the availablility of new API. https://bugzilla.gnome.org/show_bug.cgi?id=775616 --- plugins/rdp/vinagre-rdp-tab.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c index b731f9b..7c806bf 100644 --- a/plugins/rdp/vinagre-rdp-tab.c +++ b/plugins/rdp/vinagre-rdp-tab.c @@ -591,11 +591,15 @@ frdp_post_connect (freerdp *instance) #if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && \ FREERDP_VERSION_MINOR >= 2)) - CLRBUF_24BPP, + CLRBUF_24BPP, NULL #else - CLRBUF_32BPP, +#ifdef CLRBUF_32BPP + CLRBUF_32BPP, NULL +#else + PIXEL_FORMAT_BGRA32 +#endif #endif - NULL); + ); gdi = instance->context->gdi; instance->update->BeginPaint = frdp_begin_paint; -- 2.11.0