[Mesa-dev] [PATCH] meson: Allow building glvnd with EGL and non-dri based GLX

[Dylan Baker]

Quoting Eric Engestrom (2017-11-01 06:36:35)
> On Tuesday, 2017-10-31 13:57:25 -0700, Dylan Baker wrote:
> > Because meson mirrors the auototools logic, it needs the same changes to
> > allow building glvnd based EGL without building any GLX.
> > 
> > Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> > ---
> > 
> > Emil, 
> > 
> > This implements the same logic that you're implementing for meson: one or both
> > of dri based GLX or EGL is required for glvnd, but not xlib* based GLX. Could
> > you add this into your series?
> > 
> >  meson.build | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meson.build b/meson.build
> > index d22d49535af..4e4718686ac 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -231,8 +231,12 @@ if with_glx != 'disabled'
> >  endif
> >  
> >  with_glvnd = get_option('glvnd')
> > -if with_glvnd and with_glx != 'dri'
> > -  message('glvnd requires dri based glx')
> > +if with_glvnd
> > +  if with_glx == 'xlib' or with_glx == 'gallium-xlib'
> > +    error('Cannot build glvnd support for GLX that is not DRI based.')
> > +  if with_glx == 'disabled' and not with_egl
> 
> s/if/elif/
> 
> with that fixed:
> Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

oops!

> 
> > +    error('glvnd requires DRI based GLX and/or EGL')
> > +  endif
> >  endif
> >  
> >  # TODO: toggle for this
> > -- 
> > 2.14.3
> > 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171101/bf768b21/attachment.sig>