]>
Commit | Line | Data |
---|---|---|
3f6d195e JB |
1 | --- mesa-mesa-19.1.7/meson.build.orig 2019-09-17 12:31:43.000000000 +0200 |
2 | +++ mesa-mesa-19.1.7/meson.build 2019-10-06 20:18:10.222928443 +0200 | |
3 | @@ -493,7 +493,8 @@ | |
4 | with_gallium_xvmc = false | |
5 | if _xvmc != 'false' | |
6 | dep_xvmc = dependency('xvmc', version : '>= 1.0.6', required : _xvmc == 'true') | |
7 | - with_gallium_xvmc = dep_xvmc.found() | |
8 | + dep_xv = dependency('xv', required : _xvmc == 'true') | |
9 | + with_gallium_xvmc = dep_xvmc.found() and dep_xv.found() | |
10 | endif | |
11 | ||
12 | xvmc_drivers_path = get_option('xvmc-libs-path') | |
13 | --- mesa-mesa-19.1.7/src/gallium/state_trackers/xvmc/meson.build.orig 2019-09-17 12:31:43.000000000 +0200 | |
14 | +++ mesa-mesa-19.1.7/src/gallium/state_trackers/xvmc/meson.build 2019-10-06 20:18:31.069482175 +0200 | |
15 | @@ -23,7 +23,7 @@ | |
16 | files('attributes.c', 'block.c', 'context.c', 'surface.c', 'subpicture.c'), | |
17 | c_args : [c_vis_args], | |
18 | include_directories : [inc_common], | |
19 | - dependencies : [dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], | |
20 | + dependencies : [dep_xvmc, dep_xv, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], | |
21 | ) | |
22 | ||
23 | # These tests will not work without a working xvmc configuration. |