The VDPAU state tracker needs to be linked with whole-archive (autotools
does this), and a few dependeies can be cleaned up
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
---
src/gallium/targets/vdpau/meson.build | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/gallium/targets/vdpau/meson.build
b/src/gallium/targets/vdpau/meson.build
index 67f1469..53af146 100644
--- a/src/gallium/targets/vdpau/meson.build
+++ b/src/gallium/targets/vdpau/meson.build
@@ -23,6 +23,7 @@
# configure.ac)
vdpau_link_args = []
+vdpau_link_with = []
vdpau_link_depends = []
vdpau_drivers = []
@@ -35,6 +36,13 @@ if with_ld_dynamic_list
vdpau_link_depends += files('../dri-vdpau.dyn')
endif
+if with_dri
+ vdpau_link_with += libswdri
+endif
+if with_gallium_drisw_kms
+ vdpau_link_with += libswkmsdri
+endif
+
libvdpau_gallium = shared_library(
'vdpau_gallium',
'target.c',
@@ -44,13 +52,13 @@ libvdpau_gallium = shared_library(
include_directories : [
inc_common, inc_util, inc_gallium_winsys, inc_gallium_drivers,
],
+ link_whole : [libvdpau_st],
link_with : [
- libvdpau_st, libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
- libpipe_loader_static, libws_null, libwsw,
+ libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libpipe_loader_static, libws_null, libwsw, vdpau_link_with,
],
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,
)
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
