The state tracker needs to be linked with whole-archive (like
autotools), and we need a few window system deps.
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
---
src/gallium/targets/va/meson.build | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/gallium/targets/va/meson.build
b/src/gallium/targets/va/meson.build
index 0ea0cd1..e2785d0 100644
--- a/src/gallium/targets/va/meson.build
+++ b/src/gallium/targets/va/meson.build
@@ -25,14 +25,19 @@
va_deps = []
va_link_args = []
va_link_depends = []
+va_link_with = []
va_drivers = []
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]
+
+if with_dri
+ va_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+ va_link_with += libswkmsdri
endif
libva_gallium = shared_library(
@@ -44,9 +49,10 @@ libva_gallium = shared_library(
include_directories : [
inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
],
+ link_whole : [libva_st],
link_with : [
- libva_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
- libpipe_loader_static, libws_null, libwsw,
+ libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libpipe_loader_static, libws_null, libwsw, va_link_with,
],
dependencies : [
dep_libdrm, dep_thread, va_deps, driver_r600, driver_radeonsi,
driver_nouveau,
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
