[Mesa-dev] [PATCH 11/14] meson: fix missing dependencies

[Emil Velikov]

On 6 January 2018 at 01:50, Dylan Baker <dylan at pnwbakers.com> wrote:
> On January 5, 2018 5:00:59 PM PST, Greg V <greg at unrelenting.technology> wrote:
>>On 01/06/2018 01:36, Dylan Baker wrote:
>>> Quoting Greg V (2017-12-31 08:55:25)
>>>> ---
>>>>   src/gallium/drivers/radeonsi/meson.build | 2 +-
>>>>   src/mesa/meson.build                     | 1 +
>>>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/src/gallium/drivers/radeonsi/meson.build
>>b/src/gallium/drivers/radeonsi/meson.build
>>>> index 58132bf072..8a7045de0d 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,
>>>> +  dependencies : [dep_llvm, dep_libdrm],
>>>>   )
>>> I believe this could be correct, but I don't see this in autotools or
>>scons,
>>> what is the error you're seeing?
>>../src/gallium/drivers/radeonsi/si_fence.c:25:10: fatal error:
>>'libsync.h' file not found
>>>>   driver_radeonsi = declare_dependency(
>>>> diff --git a/src/mesa/meson.build b/src/mesa/meson.build
>>>> index ab6bc27312..74b8d97231 100644
>>>> --- a/src/mesa/meson.build
>>>> +++ b/src/mesa/meson.build
>>>> @@ -721,6 +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 : [dep_vdpau],
>>>>     build_by_default : false,
>>>>   )
>>> This is wrong, there is no way that core mesa needs to link against
>>vdpau, what
>>> error are you fixing?
>>../src/gallium/include/state_tracker/vdpau_dmabuf.h:37:10: fatal error:
>>
>>'vdpau/vdpau.h' file not found
>>
>>I'm not sure how to mark a dependency as "only for headers"…
>
> There currently isn't a way to do that, I'm writing a patch to add one, as a workaround, you can use the run command with pkg-config I suggested on the other patch.

Actually a better solution is to remove the unnecessary includes, all together:
 - vdpau_dmabuf.h - add forward declaration for VdpVideoSurface and
drop the header
 - st_vdpau.c - move the includes within the HAVE_ST_VDPAU guard

Greg, can you give it a try?
-Emil