diff options
| author | Dylan Baker <[email protected]> | 2019-09-26 15:42:59 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-09-30 09:09:57 -0700 |
| commit | 2dbf10ba3d129d59e1a6c0e46b24c20629b277c6 (patch) | |
| tree | 859308d3a96fd216a42324939c1018233f82bf16 /src | |
| parent | daeb959c91320052bfccb5e8d6869b6dd740d1d5 (diff) | |
meson: Link xvmc with libxv
Prior to xvmc 1.0.12 libxvmc incorrectly required libxv, but that was
fixed. This results in compilation failures for the gallium xvmc tracker
and tools. This patch fixes that by explicitly linking to libxv.
Fixes: 22a817af8a89eb3c762fc3e07b443a3ce37d7416
("meson: build gallium xvmc state tracker")
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1844
Reviewed-by: Adam Jackson <[email protected]>
(cherry picked from commit e456a053c3d6ec4f3d4581edcad05c72dfdaa407)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/state_trackers/xvmc/meson.build | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build index f66b4f2a337..920b92ee19a 100644 --- a/src/gallium/state_trackers/xvmc/meson.build +++ b/src/gallium/state_trackers/xvmc/meson.build @@ -23,7 +23,9 @@ libxvmc_st = static_library( files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'), c_args : [c_vis_args], include_directories : [inc_common], - dependencies : [dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], + dependencies : [ + dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv, + ], ) # These tests will not work without a working xvmc configuration. @@ -41,7 +43,8 @@ if with_tools.contains('xvmc') _name, files('tests/test_@[email protected]'.format(x), 'tests/testlib.c'), dependencies : [ - dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw, + dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, + dep_xvmcw, dep_xv, ], install: true, ) @@ -51,7 +54,8 @@ if with_tools.contains('xvmc') 'xvmc_bench', files('tests/xvmc_bench.c', 'tests/testlib.c'), dependencies : [ - dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xvmcw, + dep_real_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, + dep_xvmcw, dep_xv, ], install: true, ) |