From 7023b373ec76a2ea25b1bd0a7501276de9007047 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 17 Jan 2018 10:26:58 -0800 Subject: meson: link dri3 xcb libs into vlwinsys instead of into each target This makes the dependencies easier to manage, since each media target doesn't need to worry about linking to half a dozen libraries. Fixes: b1b65397d0c4978e3 ("meson: Build gallium auxiliary") Signed-off-by: Dylan Baker Acked-by: Eric Engestrom Reviewed-by: Emil Velikov --- src/gallium/targets/va/meson.build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/gallium/targets/va/meson.build') diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 0ea0cd1c05a..1e453c9f760 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -22,7 +22,6 @@ # Static targets are always enabled in autotools (unless you modify # configure.ac) -va_deps = [] va_link_args = [] va_link_depends = [] va_drivers = [] @@ -31,9 +30,6 @@ if with_ld_version_script va_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'va.sym')] va_link_depends += files('va.sym') endif -if with_platform_x11 - va_deps += [dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3] -endif libva_gallium = shared_library( 'gallium_drv_video', @@ -49,7 +45,7 @@ libva_gallium = shared_library( libpipe_loader_static, libws_null, libwsw, ], dependencies : [ - dep_libdrm, dep_thread, va_deps, driver_r600, driver_radeonsi, driver_nouveau, + dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau, ], link_depends : va_link_depends, install : true, -- cgit v1.2.3