From cb3f1b01052b5c83d7d31139e9b4243cf6db4649 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 23 Jan 2017 15:45:30 +0000 Subject: [PATCH] compositor-rdp: Fix build with freerdp2, take 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Hi Pekka, On 23 January 2017 at 14:15, Pekka Paalanen wrote: > On Fri, 20 Jan 2017 11:31:08 +0100 > Emilio Pozuelo Monfort wrote: >> This version works for me... > > Hi guys, > > I found another guest to the party. Using net-misc/freerdp-2.0.0_pre20160722 > Weston master fails to build with: > > > In file included from /usr/include/freerdp2/freerdp/codecs.h:25:0, > from /usr/include/freerdp2/freerdp/freerdp.h:46, > from /home/pq/git/weston/libweston/compositor-rdp.c:69: > /home/pq/git/weston/libweston/compositor-rdp.c: In function ‘rdp_peer_context_new’: > /usr/include/freerdp2/freerdp/codec/color.h:85:72: error: ‘FREERDP_PIXEL_FORMAT_TYPE_BGRA’ undeclared (first use in this function) > [... snip ...] > > However, updating to net-misc/freerdp-2.0.0_pre20161219 allows things > to build for me again. There is just one warning: How about this fixup? Signed-off-by: Pekka Paalanen --- libweston/compositor-rdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c index e6dad99..d9668e8 100644 --- a/libweston/compositor-rdp.c +++ b/libweston/compositor-rdp.c @@ -85,7 +85,7 @@ #define DEFAULT_AXIS_STEP_DISTANCE 10 #define RDP_MODE_FREQ 60 * 1000 -#if FREERDP_VERSION_MAJOR >= 2 && defined(PIXEL_FORMAT_BGRA32) && !defined(RDP_PIXEL_FORMAT_B8G8R8A8) +#if FREERDP_VERSION_MAJOR >= 2 && defined(PIXEL_FORMAT_BGRA32) && !defined(PIXEL_FORMAT_B8G8R8A8) /* The RDP API is truly wonderful: the pixel format definition changed * from BGRA32 to B8G8R8A8, but some versions ship with a definition of * PIXEL_FORMAT_BGRA32 which doesn't actually build. Try really, really, -- 2.7.4