Skip to content

Commit c464d3f

Browse files
uartiexhaihao
authored andcommitted
meson: libva-xyz should be same version as detected libva
This will help prevent erroneous linking to mixed versions of libva-xyz window system libraries that may not be binary compatible. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
1 parent 71919fc commit c464d3f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ drm_deps=[]
2525
if get_option('drm') != 'false'
2626
require_drm = get_option('drm') == 'true'
2727
drm_deps = [
28-
dependency('libva-drm', required: require_drm),
28+
dependency('libva-drm', version: libva_dep.version(), required: require_drm),
2929
dependency('libdrm', required: require_drm),
3030
]
3131
use_drm = true
@@ -46,7 +46,7 @@ if get_option('x11') != 'false'
4646
require_x11 = get_option('x11') == 'true'
4747
x11_deps = [
4848
dependency('x11', required: require_x11),
49-
dependency('libva-x11', required: require_x11),
49+
dependency('libva-x11', version: libva_dep.version(), required: require_x11),
5050
]
5151
use_x11 = true
5252
foreach d : x11_deps
@@ -66,7 +66,7 @@ if get_option('wayland') != 'false'
6666
require_wayland = get_option('wayland') == 'true'
6767
wayland_deps = [
6868
dependency('wayland-client', version: '>= 1.0.0', required: require_wayland),
69-
dependency('libva-wayland', required: require_wayland),
69+
dependency('libva-wayland', version: libva_dep.version(), required: require_wayland),
7070
]
7171
use_wayland = true
7272
foreach d : wayland_deps
@@ -84,7 +84,7 @@ endif
8484
use_win32 = false
8585
if get_option('win32') != 'false'
8686
require_win32 = get_option('win32') == 'true'
87-
use_win32 = dependency('libva-win32', required: require_win32).found()
87+
use_win32 = dependency('libva-win32', version: libva_dep.version(), required: require_win32).found()
8888
if use_win32
8989
libva_utils_flags = [ '-DHAVE_VA_WIN32=1', '-DNOMINMAX']
9090
dep_dxheaders = dependency('directx-headers', required : false)

0 commit comments

Comments
 (0)