This needs to link the state tracker with --whole-archive to expose the
right symbols.
v4: - Always add libswdri and libswkmsdri to the link_with list
Fixes: 22a817af8a89eb3c7 ("meson: build gallium xvmc state tracker")
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
---
src/gallium/targets/xvmc/meson.build | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/gallium/targets/xvmc/meson.build
b/src/gallium/targets/xvmc/meson.build
index 07d6c72..1c25f6d 100644
--- a/src/gallium/targets/xvmc/meson.build
+++ b/src/gallium/targets/xvmc/meson.build
@@ -1,4 +1,4 @@
-# Copyright © 2017 Intel Corporation
+# Copyright © 2017-2018 Intel Corporation
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +31,7 @@ if with_ld_version_script
xvmc_link_depends += files('xvmc.sym')
endif
+
libxvmc_gallium = shared_library(
'XvMCgallium',
'target.c',
@@ -40,9 +41,10 @@ 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,
+ libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
+ libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [dep_thread, driver_r600, driver_nouveau],
link_depends : xvmc_link_depends,
--
git-series 0.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
