[Mesa-dev] [PATCH 6/6] meson: fix xvmc target linkage

[Dylan Baker]

This needs to link the state tracker with whole-archive, it needs to
link with libxvmc, and it needs a few extra window system dependencies.

Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
---
 meson.build                          |  5 -----
 src/gallium/targets/xvmc/meson.build | 18 ++++++++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index bd4afdf..dae9794 100644
--- a/meson.build
+++ b/meson.build
@@ -437,11 +437,6 @@ elif _xvmc == 'true'
 else
   with_gallium_xvmc = false
 endif
-if with_gallium_xvmc
-  dep_xvmc = declare_dependency(
-    compile_args : dep_xvmc.get_pkgconfig_variable('cflags').split()
-  )
-endif
 
 xvmc_drivers_path = get_option('xvmc-libs-path')
 if xvmc_drivers_path == ''
diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
index 48759de..4889942 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -24,6 +24,7 @@
 
 xvmc_link_args = []
 xvmc_link_depends = []
+xvmc_link_with = []
 xvmc_drivers = []
 
 if with_ld_version_script
@@ -31,6 +32,13 @@ if with_ld_version_script
   xvmc_link_depends += files('xvmc.sym')
 endif
 
+if with_dri
+  xvmc_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+  xvmc_link_with += libswkmsdri
+endif
+
 libxvmc_gallium = shared_library(
   'XvMCgallium',
   'target.c',
@@ -40,14 +48,12 @@ libxvmc_gallium = shared_library(
   include_directories : [
     inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
+  link_whole : [libxvmc_st],
   link_with : [
-    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,
+    libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+    libpipe_loader_static, libws_null, libwsw, xvmc_link_with,
   ],
+  dependencies : [dep_thread, driver_r600, driver_nouveau],
   link_depends : xvmc_link_depends,
 )
 
-- 
git-series 0.9.1