[Mesa-dev] [PATCH mesa] meson: vc4 requires libdrm too

[Eric Engestrom]

On Wednesday, 2018-09-05 11:38:30 -0700, Dylan Baker wrote:
> Quoting Eric Engestrom (2018-09-05 11:19:43)
> > On Wednesday, 2018-09-05 10:26:14 -0700, Dylan Baker wrote:
> > > Quoting Eric Anholt (2018-09-05 10:05:15)
> > > > Eric Engestrom <eric.engestrom at intel.com> writes:
> > > > 
> > > > > Anccording to 4fc0ebdff55419965919e "broadcom/vc4: Bump libdrm requirement",
> > > > > vc4 is a special case here as it does not use its libdrm_vc4, but only depends
> > > > > on core libdrm.
> > > > >
> > > > > The way the version check was added however means that the core libdrm
> > > > > dependency() needs to be explicitly required if vc4 is being built.
> > > > >
> > > > > Fixes: 4fc0ebdff55419965919e "broadcom/vc4: Bump libdrm requirement"
> > > > > Cc: Eric Anholt <eric at anholt.net>
> > > > > Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
> > > > > ---
> > > > >  meson.build | 2 +-
> > > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/meson.build b/meson.build
> > > > > index 55416020402620a2565e..474d8692a956b0151b5c 100644
> > > > > --- a/meson.build
> > > > > +++ b/meson.build
> > > > > @@ -1140,7 +1140,7 @@ endforeach
> > > > >  with_gallium_drisw_kms = false
> > > > >  dep_libdrm = dependency(
> > > > >    'libdrm', version : '>=' + _drm_ver,
> > > > > -  required : with_dri2 or with_dri3
> > > > > +  required : with_dri2 or with_dri3 or with_gallium_vc4
> > > > 
> > > > vc4 without with_dri2 or with_dri3?  I'm confused.
> > > 
> > > I guess it is theoretically possible to hit this case, if you were to build vc4
> > > with the gallium xlib base glx and no egl then I guess you could hit this?
> > > Maybe?
> > 
> > Yeah, I didn't check but this felt like it was possible.
> > At best, this fixes a possible build issue.
> > At worst, this is an explicit check that turns out to be redundant.
> 
> Well, my theory is bust. I uninstalled libdrm then ran:
> meson build -Dglx=gallium-xlib -Dgallium-drivers=swrast,vc4 -Ddri-drivers= -Dvulkan-drivers=
> ninja -C build
> 
> And it compiled and linked fine. I'm out of cases where we could run into a case
> where we need libdrm but don't enforce it.

OK then, dropping it I guess. Sorry for the noise :]

> 
> Dylan