[Mesa-dev] [PATCH v3 2/9] meson: link dri3 xcb libs into vlwinsys instead of into each target

[Dylan Baker]

Quoting Emil Velikov (2018-02-08 15:03:37)
> On 2 February 2018 at 19:30, Dylan Baker <dylan at pnwbakers.com> wrote:
> > This makes the dependencies easier to manage, since each media target
> > doesn't need to worry about linking to half a dozen libraries.
> >
> > Fixes: b1b65397d0c4978e3 ("meson: Build gallium auxiliary")
> > Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> > ---
> >  src/gallium/auxiliary/meson.build            | 7 ++++++-
> >  src/gallium/targets/omx-bellagio/meson.build | 5 +----
> >  src/gallium/targets/va/meson.build           | 6 +-----
> >  src/gallium/targets/vdpau/meson.build        | 3 +--
> >  src/gallium/targets/xa/meson.build           | 3 +--
> >  src/gallium/targets/xvmc/meson.build         | 5 +----
> >  6 files changed, 11 insertions(+), 18 deletions(-)
> >
> > diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
> > index 6f1542d..5908f9c 100644
> > --- a/src/gallium/auxiliary/meson.build
> > +++ b/src/gallium/auxiliary/meson.build
> > @@ -452,10 +452,15 @@ files_libgalliumvl = files(
> >    'vl/vl_zscan.h',
> >  )
> >
> > +vlwinsys_deps = []
> >  files_libgalliumvlwinsys = files('vl/vl_winsys.h')
> >  if with_dri2
> >    files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c')
> >    if with_dri3
> > +    vlwinsys_deps += [
> > +      dep_xcb_sync, dep_xcb_present, dep_xshmfence, dep_xcb_xfixes,
> > +      dep_xcb_dri3,
> > +    ]
> Nice, I just suggested that in the previous patch. Perhaps you can
> flip their order?
> From a quick look with_dri2/with_dri3 do not honour platform_x11.
> 
> -Emil

Sure, we can flip this around, the order of the first couple patches is
arbitrary.

The dri and x11 stuff is a little convoluted to avoid looking up the same
dependency multiple times. meson 0.45 has a dependency cache, and once we can
start relying on that I have a TODO to go through and refactor all of that stuff
to be saner.

Dylan
-------------- 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-dev/attachments/20180208/5c85ad78/attachment.sig>