On Friday, 2017-12-01 14:03:16 -0800, Dylan Baker wrote:
> Currently this pkg-config file is only installed if a classic dri driver
> is built. This is wrong, it should be installed if any dri driver is
> installed, which includes the gallium dri target.
>
> Reported-by: Marc Dietrich <marvi...@gmx.de>
> Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
> ---
> src/mesa/drivers/dri/meson.build | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/meson.build
> b/src/mesa/drivers/dri/meson.build
> index 217f1e5c71c..4ec2f343df2 100644
> --- a/src/mesa/drivers/dri/meson.build
> +++ b/src/mesa/drivers/dri/meson.build
> @@ -53,6 +53,17 @@ if dri_drivers != []
> link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic,
> ld_args_gc_sections],
> )
>
> + meson.add_install_script(
> + join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
> + libmesa_dri_drivers.full_path(),
> + dri_drivers_path,
> + dri_link,
> + )
> +endif
> +
> +# This needs to be installed if any dri drivers (including gallium dri
> drivers)
> +# are built.
> +if with_dri
> pkg.generate(
> name : 'dri',
> filebase : 'dri',
> @@ -61,11 +72,4 @@ if dri_drivers != []
> variables : ['dridriverdir=${prefix}/' + dri_drivers_path],
> requires_private : ['libdrm >= 2.4.75'], # FIXME: don't hardcode this
> )
> -
> - meson.add_install_script(
> - join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
> - libmesa_dri_drivers.full_path(),
> - dri_drivers_path,
> - dri_link,
> - )
> endif
> --
> 2.15.0
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
