[Mesa-stable] [Mesa-dev] [PATCH v2] meson: Don't allow building EGL on Windows or MacOS

[Dylan Baker]

Quoting Eric Engestrom (2018-10-10 10:15:35)
> On Wednesday, 2018-10-10 09:22:46 -0700, Dylan Baker wrote:
> > Quoting Eric Engestrom (2018-10-04 07:54:07)
> > > On Wednesday, 2018-10-03 11:05:36 -0700, Dylan Baker wrote:
> > > > Quoting Dylan Baker (2018-10-03 10:35:45)
> > > > > Currently mesa only supports EGL on Unix like systems, cygwin, and
> > > > > haiku. Meson should actually enforce this. This fixes the default build
> > > > > on MacOS.
> > > > > 
> > > > > v2: - invert the condition, mark darwin and windows as not supported
> > > > >       instead of trying to mark what is supported.
> > > > > 
> > > > > CC: 18.2 <mesa-stable at lists.freedesktop.org>
> > > > > ---
> > > > >  meson.build | 7 ++++++-
> > > > >  1 file changed, 6 insertions(+), 1 deletion(-)
> > > > > 
> > > > > diff --git a/meson.build b/meson.build
> > > > > index e4b9f04949c..2894c4931ac 100644
> > > > > --- a/meson.build
> > > > > +++ b/meson.build
> > > > > @@ -306,7 +306,10 @@ endif
> > > > >  
> > > > >  _egl = get_option('egl')
> > > > >  if _egl == 'auto'
> > > > > -  with_egl = with_dri and with_shared_glapi and with_platforms
> > > > > +  with_egl = (
> > > > > +    not ['darwin', 'windows'].contains(host_machine.system() and
> > > >                                                                ^
> > > > There's a missing brace here, I forgot to commit that change before I sent the
> > > > patch :( I've squashed that and saved as a v3 locally.
> > > > 
> > > > > +    with_dri and with_shared_glapi and with_platforms
> > > > > +  )
> > > > >  elif _egl == 'true'
> > > > >    if not with_dri
> > > > >      error('EGL requires dri')
> > > > > @@ -316,6 +319,8 @@ elif _egl == 'true'
> > > > >      error('No platforms specified, consider -Dplatforms=drm,x11,surfaceless at least')
> > > > >    elif not ['disabled', 'dri'].contains(with_glx)
> > > > >      error('EGL requires dri, but a GLX is being built without dri')
> > > > > +  elif ['darwin', 'windows'].contains(host_machine.system())
> > > > > +    error('EGL is not valid on systems that don\'t use KMS except Haiku.')
> > > 
> > > I usually use `'''` when I need to put a `'` in the string :)
> > 
> > I guess I really should update this comment to say "something like "EGL is not
> > available on Windows or MacOS", since that's what the patch actually does...
> > 
> > Does your review still sand with that change?
> 
> Of course!

Thanks!

> 
> > 
> > > Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
> > > 
> > > > >    endif
> > > > >    with_egl = true
> > > > >  else
> > > > > -- 
> > > > > 2.19.0
> > > > > 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-stable/attachments/20181010/ec9f83d4/attachment.sig>