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

[Daniel Stone]

Hi,

On 23 January 2017 at 15:45, Daniel Stone <daniel at fooishbar.org> wrote:
> On 23 January 2017 at 14:15, Pekka Paalanen <ppaalanen at gmail.com> wrote:
>> 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?
> 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,

The above works for me on Debian stretch and Fedora 25.

>> /home/pq/git/weston/libweston/compositor-rdp.c: In function ‘rdp_peer_init’:
>> /home/pq/git/weston/libweston/compositor-rdp.c:1229:33: warning: assignment from incompatible pointer type
>>   client->update->SuppressOutput = xf_suppress_output;
>>                                  ^
>
> Wonderful. I'm not going to touch that one though ...

I don't see this on either Debian or Fedora, but I _do_ see this on
Debian stretch only:
../libweston/compositor-rdp.c: In function ‘rdp_peer_init’:
../libweston/compositor-rdp.c:1223:10: error: ‘rdpSettings {aka struct
rdp_settings}’ has no member named ‘SurfaceFrameMarkerEnabled’; did
you mean ‘SurfaceCommandsEnabled’?
  settings->SurfaceFrameMarkerEnabled = TRUE;
          ^~

/me disables RDP again, moves on with his life

Cheers,
Daniel