How can I get some traction on this? On Mon, Jun 4, 2018 at 12:38 PM Lukas Rusak <loru...@gmail.com> wrote:
> I noticed that the generated pkg-config files will include > glx and x11 dependencies even when x11 isn't a selected platform. > > This fixes the private libs and was tested by building kmscube > > V2: > - check if gallium-xlib is being used for glx > > Reviewed-by: Dylan Baker <dy...@pnwbakers.com> > --- > meson.build | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/meson.build b/meson.build > index 4aafba802a..b1ab9d6a20 100644 > --- a/meson.build > +++ b/meson.build > @@ -1339,18 +1339,24 @@ endforeach > > inc_include = include_directories('include') > > -gl_priv_reqs = [ > - 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', > - 'xcb-glx >= 1.8.1'] > +gl_priv_reqs = [] > + > +if with_glx == 'xlib' or with_glx == 'gallium-xlib' > + gl_priv_reqs += ['x11', 'xext', 'xcb'] > +elif with_glx == 'dri' > + gl_priv_reqs += [ > + 'x11', 'xext', 'xdamage >= 1.1', 'xfixes', 'x11-xcb', 'xcb', > + 'xcb-glx >= 1.8.1'] > + if with_dri_platform == 'drm' > + gl_priv_reqs += 'xcb-dri2 >= 1.8' > + endif > +endif > if dep_libdrm.found() > gl_priv_reqs += 'libdrm >= 2.4.75' > endif > if dep_xxf86vm.found() > gl_priv_reqs += 'xxf86vm' > endif > -if with_dri_platform == 'drm' > - gl_priv_reqs += 'xcb-dri2 >= 1.8' > -endif > > gl_priv_libs = [] > if dep_thread.found() > -- > 2.17.0 > >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev