diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/va/meson.build | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build index b39e2f8ab96..570c5080ad8 100644 --- a/meson.build +++ b/meson.build @@ -546,7 +546,7 @@ with_gallium_va = _va == 'true' dep_va = [] if with_gallium_va dep_va = dependency('libva', version : '>= 0.38.0') - dep_va = declare_dependency( + dep_va_headers = declare_dependency( compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() ) endif diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build index bddd5ef6a67..deb1127483e 100644 --- a/src/gallium/state_trackers/va/meson.build +++ b/src/gallium/state_trackers/va/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -18,7 +18,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -libva_version = ['2', '3', '0'] +libva_version = dep_va.version().split('.') libva_st = static_library( 'va_st', @@ -35,5 +35,5 @@ libva_st = static_library( ), ], include_directories : [inc_common], - dependencies : [dep_va, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], + dependencies : [dep_va_headers, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3], ) |