diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2017-01-23 15:45:30 +0000 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2017-01-27 12:23:08 +0200 |
| commit | cb3f1b01052b5c83d7d31139e9b4243cf6db4649 (patch) | |
| tree | 596265390d8b1a2f52c4871988ec1faf179010d6 | |
| parent | 605ac8e685b24c0a88a86f6d64d0fb36ccd26270 (diff) | |
compositor-rdp: Fix build with freerdp2, take 2
Hi Pekka,
On 23 January 2017 at 14:15, Pekka Paalanen <ppaalanen@gmail.com> wrote:
> On Fri, 20 Jan 2017 11:31:08 +0100
> Emilio Pozuelo Monfort <pochu@debian.org> 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 <pekka.paalanen@collabora.co.uk>
| -rw-r--r-- | libweston/compositor-rdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c index e6dad99f..d9668e86 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, |