[Mesa-dev] [PATCH v2 4/4] meson: fix missing dependencies

[Dylan Baker]

Quoting Greg V (2018-01-17 12:54:18)
> ---
>  meson.build                              | 4 ++++
>  src/gallium/drivers/radeonsi/meson.build | 2 +-
>  src/mesa/meson.build                     | 2 +-
>  3 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 7dbc9d6518..a301a62f3c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -949,6 +949,10 @@ if dep_libdrm.found()
>    endif
>  endif
>  
> +dep_libdrm_headers = declare_dependency(
> +  compile_args : run_command(prog_pkgconfig, ['libdrm', '--cflags']).stdout().split()
> +)
> +
>  # TODO: some of these may be conditional
>  dep_zlib = dependency('zlib', version : '>= 1.2.3')
>  pre_args += '-DHAVE_ZLIB'
> diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
> index 97c7a41244..15417d22bf 100644
> --- a/src/gallium/drivers/radeonsi/meson.build
> +++ b/src/gallium/drivers/radeonsi/meson.build
> @@ -77,7 +77,7 @@ libradeonsi = static_library(
>    ],
>    c_args : [c_vis_args],
>    cpp_args : [cpp_vis_args],
> -  dependencies : [dep_llvm, idep_nir_headers],
> +  dependencies : [dep_llvm, dep_libdrm_headers, idep_nir_headers],
>  )

I'm not sure about the two hunks above. There are a number of places that we're
currently using the full libdrm dependency (including linking) apart from
radeonsi. I think I'd rather:
1) just use dep_libdrm here
2) convert all uses of libdrm that don't actually need linking to use
   dep_libdrm_headers all at once.

It's probably worth doing 2 at some point even if we don't do it now.

The rest of this looks good though.

Dylan

>  
>  driver_radeonsi = declare_dependency(
> diff --git a/src/mesa/meson.build b/src/mesa/meson.build
> index 998953d641..32eed5231b 100644
> --- a/src/mesa/meson.build
> +++ b/src/mesa/meson.build
> @@ -721,7 +721,7 @@ libmesa_gallium = static_library(
>    cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
>    include_directories : [inc_common, include_directories('main')],
>    link_with : [libglsl, libmesa_sse41],
> -  dependencies : idep_nir_headers,
> +  dependencies : [idep_nir_headers, dep_vdpau],
>    build_by_default : false,
>  )
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180118/8daa831e/attachment-0001.sig>