Re: [Mesa-dev] [PATCH 2/2] meson+dri3: allow building against older xcb (v3)

2018-03-14 Thread Dylan Baker
Quoting Dylan Baker (2018-03-14 09:42:36)
> Quoting Rob Clark (2018-03-14 06:04:58)
> > Similar to previous patch, make xcb 1.13 optional.
> > 
> > Signed-off-by: Rob Clark 
> > ---
> >  meson.build | 11 ---
> >  1 file changed, 8 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meson.build b/meson.build
> > index c201644c372..0e2f73e67b6 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1235,9 +1235,14 @@ if with_platform_x11
> >  dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
> >  
> >  if with_dri3
> > -  pre_args += ['-DHAVE_DRI3', '-DHAVE_DRI3_MODIFIERS']
> > -  dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13')
> > -  dep_xcb_present = dependency('xcb-present', version: '>= 1.13')
> > +  pre_args += '-DHAVE_DRI3'
> > +  dep_xcb_dri3 = dependency('xcb-dri3')
> > +  dep_xcb_present = dependency('xcb-present')
> > +  # until xcb-dri3 has been around long enough to make a 
> > hard-dependency:
> > +  if (dep_xcb_dri3.version().version_compare('>= 1.13') and
> > +  dep_xcb_present.version().version_compare('>= 1.13'))
> > +pre_args += '-DHAVE_DRI3_MODIFIERS'
> > +  endif
> >dep_xcb_sync = dependency('xcb-sync')
> >dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
> >  endif
> > -- 
> > 2.14.3
> > 
> 
> I don't care about building against old versions of xcb either, but this is 
> very
> minimally intrusive so I don't have a problem with it,
> 
> Reviewed-by: Dylan Baker 

Oh, just this patch, I'm not qualified to review the first one :)

Dylan


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH 2/2] meson+dri3: allow building against older xcb (v3)

2018-03-14 Thread Dylan Baker
Quoting Rob Clark (2018-03-14 06:04:58)
> Similar to previous patch, make xcb 1.13 optional.
> 
> Signed-off-by: Rob Clark 
> ---
>  meson.build | 11 ---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index c201644c372..0e2f73e67b6 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1235,9 +1235,14 @@ if with_platform_x11
>  dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
>  
>  if with_dri3
> -  pre_args += ['-DHAVE_DRI3', '-DHAVE_DRI3_MODIFIERS']
> -  dep_xcb_dri3 = dependency('xcb-dri3', version : '>= 1.13')
> -  dep_xcb_present = dependency('xcb-present', version: '>= 1.13')
> +  pre_args += '-DHAVE_DRI3'
> +  dep_xcb_dri3 = dependency('xcb-dri3')
> +  dep_xcb_present = dependency('xcb-present')
> +  # until xcb-dri3 has been around long enough to make a hard-dependency:
> +  if (dep_xcb_dri3.version().version_compare('>= 1.13') and
> +  dep_xcb_present.version().version_compare('>= 1.13'))
> +pre_args += '-DHAVE_DRI3_MODIFIERS'
> +  endif
>dep_xcb_sync = dependency('xcb-sync')
>dep_xshmfence = dependency('xshmfence', version : '>= 1.1')
>  endif
> -- 
> 2.14.3
> 

I don't care about building against old versions of xcb either, but this is very
minimally intrusive so I don't have a problem with it,

Reviewed-by: Dylan Baker 


signature.asc
Description: signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev