[PATCH xserver] meson: Fix enabling of xshmfence.

[Peter Hutterer]

On Thu, Jun 01, 2017 at 04:48:07PM -0700, Eric Anholt wrote:
> I misspelled the enable flag, so DRI3 would throw BadImplementation
> when you tried to start any GL app.  Same as in
> c7be7a688a78a34f61b90c0d95914e14b90b0cdc, we also convert it to #ifdef
> for consistency.
> 
> Signed-off-by: Eric Anholt <eric at anholt.net>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> ---
>  Xext/sync.c         | 4 ++--
>  include/meson.build | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Xext/sync.c b/Xext/sync.c
> index 4c4835929bfb..a8db0ec22371 100644
> --- a/Xext/sync.c
> +++ b/Xext/sync.c
> @@ -919,7 +919,7 @@ SyncCreate(ClientPtr client, XID id, unsigned char type)
>  int
>  SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL initially_triggered)
>  {
> -#if HAVE_XSHMFENCE
> +#ifdef HAVE_XSHMFENCE
>      SyncFence  *pFence;
>      int         status;
>  
> @@ -945,7 +945,7 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL
>  int
>  SyncFDFromFence(ClientPtr client, DrawablePtr pDraw, SyncFence *pFence)
>  {
> -#if HAVE_XSHMFENCE
> +#ifdef HAVE_XSHMFENCE
>      return miSyncFDFromFence(pDraw, pFence);
>  #else
>      return BadImplementation;
> diff --git a/include/meson.build b/include/meson.build
> index 2f88828035a7..ef3163d1f106 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -62,7 +62,7 @@ conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd')
>  # that just uses whatever directory works?
>  conf_data.set_quoted('SHMDIR', '/tmp')
>  
> -conf_data.set('XSHMFENCE', xshmfence_dep.found())
> +conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found())
>  conf_data.set('WITH_LIBDRM', libdrm_dep.found())
>  conf_data.set('GLAMOR_HAS_DRM_NAME_FROM_FD_2',
>                dependency('libdrm', version: '>= 2.4.74', required: false).found())
> -- 
> 2.11.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
>