On Monday, 2018-02-26 16:56:46 +0000, Eric Engestrom wrote:
> On Monday, 2018-02-26 08:46:54 -0800, Dylan Baker wrote:
> > libgl will be undefined if with_glx == 'disabled', so move that check
> > inside the `if with_glx == 'disabled'` block immediately after that
> typo: s/==/!=/ ^^
>
> Acked-by: Eric Engestrom <eric.engest...@imgtec.com>
>
> > check.
actually, that sentence looks off; I suggest dropping the words after "block" :)
> >
> > Fixes: 5c460337fd9c109 ("meson: Fix GL and EGL pkg-config files with glvnd")
> > Reported-by: Jason Ekstrand <jason.ekstr...@intel.com>
> > Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
> > CC: Daniel Stone <dani...@collabora.com>
> > CC: Jason Ekstrand <jason.ekstr...@intel.com>
> > ---
> > src/meson.build | 19 ++++++++++---------
> > 1 file changed, 10 insertions(+), 9 deletions(-)
> >
> > diff --git a/src/meson.build b/src/meson.build
> > index b2c045fce10..19005271d73 100644
> > --- a/src/meson.build
> > +++ b/src/meson.build
> > @@ -82,18 +82,19 @@ if with_gallium
> > subdir('gallium')
> > endif
> >
> > -# If using glvnd the pkg-config header should not point to GL_mesa, it
> > should
> > -# point to GL. glvnd is only available on unix like platforms so adding -l
> > -# should be safe here
> > -# TODO: in the glvnd case glvnd itself should really be providing this.
> > -if with_glvnd
> > - _gl = '-L${libdir} -lGL'
> > -else
> > - _gl = libgl
> > -endif
> > # This must be after at least mesa, glx, and gallium, since libgl will be
> > # defined in one of those subdirs depending on the glx provider.
> > if with_glx != 'disabled'
> > + # If using glvnd the pkg-config header should not point to GL_mesa, it
> > should
> > + # point to GL. glvnd is only available on unix like platforms so adding
> > -l
> > + # should be safe here
> > + # TODO: in the glvnd case glvnd itself should really be providing this.
> > + if with_glvnd
> > + _gl = '-L${libdir} -lGL'
> > + else
> > + _gl = libgl
> > + endif
> > +
> > pkg.generate(
> > name : 'gl',
> > description : 'Mesa OpenGL Library',
> > --
> > 2.16.2
> >
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
