fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: use va-api version reported by pkg-config

Browse source 
Fixes: 5a785d51a6 ("meson: build gallium va state tracker")
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Dylan Baker 2018-01-18 10:03:24 -08:00
parent 8eb608df61
commit 424e654cb0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -546,7 +546,7 @@ with_gallium_va = _va == 'true'
dep_va = [] dep_va = []
if with_gallium_va if with_gallium_va
dep_va = dependency('libva', version : '>= 0.38.0') 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() compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split()
) )
endif endif

6
src/gallium/state_trackers/va/meson.build
View file

@ -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 # Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal # 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 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
libva_version = ['2', '3', '0'] libva_version = dep_va.version().split('.')
libva_st = static_library( libva_st = static_library(
'va_st', 'va_st',
@ -35,5 +35,5 @@ libva_st = static_library(
), ),
], ],
include_directories : [inc_common], 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],
) )