[Mesa-dev] [PATCH 4/6] meson: Fix omx-bellagio target linkage

[Dylan Baker]

There were a couple of problems, first we need to link the whole state
tracker in (like autotools does), then we need to link with bellagio
(like autotools does), then we need a few extra dependencies that were
being lost because the state tracker wasn't being properly linked.

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

diff --git a/meson.build b/meson.build
index ae31cdd..bd4afdf 100644
--- a/meson.build
+++ b/meson.build
@@ -500,11 +500,6 @@ if with_gallium_omx
     endif
   endif
 endif
-if with_gallium_omx
-  dep_omx = declare_dependency(
-    compile_args : dep_omx.get_pkgconfig_variable('cflags').split()
-  )
-endif
 
 dep_va = []
 _va = get_option('gallium-va')
diff --git a/src/gallium/targets/omx-bellagio/meson.build b/src/gallium/targets/omx-bellagio/meson.build
index a3fba3f..75f0f02 100644
--- a/src/gallium/targets/omx-bellagio/meson.build
+++ b/src/gallium/targets/omx-bellagio/meson.build
@@ -24,6 +24,14 @@
 
 omx_link_args = []
 omx_link_depends = []
+omx_link_with = []
+
+if with_dri
+  omx_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+  omx_link_with += libswkmsdri
+endif
 
 if with_ld_version_script
   omx_link_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'omx.sym')]
@@ -39,15 +47,13 @@ libomx_gallium = shared_library(
   include_directories : [
     inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
   ],
+  link_whole : [libomx_st],
   link_with : [
-    libomx_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
-    libpipe_loader_static, libws_null, libwsw,
+    libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+    libpipe_loader_static, libws_null, libwsw, omx_link_with,
   ],
   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,
 )
-- 
git-series 0.9.1