summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2019-09-26 15:19:54 -0700
committerDylan Baker <[email protected]>2019-09-27 16:39:01 +0000
commit8c5c21d7e337bbaffe8d68d9abbb166a271b35cc (patch)
tree828d1cbc85b641f6c2d74a2f653870d487e8b7de /src
parentc5a2ccec5e9fa60bbec5e7b574877f8af4c14462 (diff)
meson: Try finding libxvmcw via pkg-config before using find_library
This fixes cross compiling issues, because pkg-config is less likely to get the wrong libs. v2: - Fix typo in comment Fixes: 22a817af8a89eb3c762fc3e07b443a3ce37d7416 ("meson: build gallium xvmc state tracker") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/939 Reviewed-by: Adam Jackson <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/xvmc/meson.build9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build
index d120d533eef..f66b4f2a337 100644
--- a/src/gallium/state_trackers/xvmc/meson.build
+++ b/src/gallium/state_trackers/xvmc/meson.build
@@ -26,10 +26,15 @@ libxvmc_st = static_library(
dependencies : [dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3],
)
-# These tests will not work without a working xvmc configuration.
+# These tests will not work without a working xvmc configuration.
if with_tools.contains('xvmc')
- dep_xvmcw = cc.find_library('XvMCW')
+ # pkg-config was added in 1.0.12, so allow fallback
+ dep_xvmcw = dependency('xvmc-wrapper', required : false)
+ if not dep_xvmcw.found()
+ dep_xvmcw = cc.find_library('XvMCW')
+ endif
dep_real_xvmc = dependency('xvmc')
+
foreach x : ['context', 'surface', 'subpicture', 'blocks', 'rendering']
_name = 'xvmc_@0@'.format(x)
executable(