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: 22a817af8a
("meson: build gallium xvmc state tracker")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/939
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user