diff options
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/omx-bellagio/meson.build | 5 | ||||
-rw-r--r-- | src/gallium/targets/va/meson.build | 6 | ||||
-rw-r--r-- | src/gallium/targets/vdpau/meson.build | 3 | ||||
-rw-r--r-- | src/gallium/targets/xa/meson.build | 3 | ||||
-rw-r--r-- | src/gallium/targets/xvmc/meson.build | 5 |
5 files changed, 5 insertions, 17 deletions
diff --git a/src/gallium/targets/omx-bellagio/meson.build b/src/gallium/targets/omx-bellagio/meson.build index a3fba3f2e43..c9e8eb8fa56 100644 --- a/src/gallium/targets/omx-bellagio/meson.build +++ b/src/gallium/targets/omx-bellagio/meson.build @@ -44,10 +44,7 @@ libomx_gallium = shared_library( libpipe_loader_static, libws_null, libwsw, ], link_depends : omx_link_depends, - dependencies : [ - dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread, - driver_r600, driver_radeonsi, driver_nouveau, - ], + dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau], install : true, install_dir : omx_drivers_path, ) 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, diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 67f1469fb0f..a03f0edfad9 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -49,8 +49,7 @@ libvdpau_gallium = shared_library( libpipe_loader_static, libws_null, libwsw, ], dependencies : [ - dep_thread, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm, - driver_r300, driver_r600, driver_radeonsi, driver_nouveau, + dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, ], link_depends : vdpau_link_depends, ) diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index 8ff6486a5ac..75808cd0a83 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/meson.build @@ -45,8 +45,7 @@ libxatracker = shared_library( ], link_depends : xa_link_depends, dependencies : [ - dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread, - driver_nouveau, driver_i915, driver_svga, driver_freedreno, + dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno, ], install : true, ) diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build index 48759de910f..07d6c729c9a 100644 --- a/src/gallium/targets/xvmc/meson.build +++ b/src/gallium/targets/xvmc/meson.build @@ -44,10 +44,7 @@ libxvmc_gallium = shared_library( libxvmc_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util, libpipe_loader_static, libws_null, libwsw, ], - dependencies : [ - dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm, dep_thread, - driver_r600, driver_nouveau, - ], + dependencies : [dep_thread, driver_r600, driver_nouveau], link_depends : xvmc_link_depends, ) |