[PATCH weston] compositor-rdp: Fix build with freerdp2

[Emilio Pozuelo Monfort]

On 19/01/17 11:26, Daniel Stone wrote:
> Hi Emilio,
> 
> On 18 January 2017 at 17:43, Emilio Pozuelo Monfort <pochu at debian.org> wrote:
>> Based on a patch from John Moser <john.r.moser at gmail.com>
>>
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850658
>>
>> Signed-off-by: Emilio Pozuelo Monfort <pochu at debian.org>
>> ---
>>  libweston/compositor-rdp.c | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
>> index 223382ce..16f4c628 100644
>> --- a/libweston/compositor-rdp.c
>> +++ b/libweston/compositor-rdp.c
>> @@ -664,13 +664,21 @@ rdp_peer_context_new(freerdp_peer* client, RdpPeerContext* context)
>>         context->rfx_context->mode = RLGR3;
>>         context->rfx_context->width = client->settings->DesktopWidth;
>>         context->rfx_context->height = client->settings->DesktopHeight;
>> +#ifdef PIXEL_FORMAT_BGRA32
>> +       rfx_context_set_pixel_format(context->rfx_context, PIXEL_FORMAT_BGRA32);
>> +#else
>>         rfx_context_set_pixel_format(context->rfx_context, RDP_PIXEL_FORMAT_B8G8R8A8);
>> +#endif
> 
> And still this fails on Fedora 25. The FreeRDP API is a thing of
> absolute magic: https://phabricator.freedesktop.org/P9
> 
> Does it build with this patch instead? https://phabricator.freedesktop.org/P10

It doesn't, because your magic is before the #include color.h which defines PIXEL_*.

This version works for me...

Cheers,
Emilio
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 01-freerdp2.patch
Type: text/x-diff
Size: 1793 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20170120/05cfa4a5/attachment.patch>