Commit 3b265f61 authored by Dylan Baker's avatar Dylan Baker

meson: gallium media state trackers require libdrm with x11

v2: - update copyright year in all changed files
    - rebase on master

Cc: 19.1 19.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
parent a0a93763
Pipeline #67504 failed with stages
in 66 minutes and 47 seconds
......@@ -1445,6 +1445,9 @@ if with_platform_x11
with_gallium_omx != 'disabled'))
dep_xcb = dependency('xcb')
dep_x11_xcb = dependency('x11-xcb')
if not dep_libdrm.found()
error('libdrm required for gallium video statetrackers when using x11')
endif
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
......
# Copyright © 2017 Intel Corporation
# Copyright © 2017, 2019 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
......@@ -19,7 +19,9 @@
# SOFTWARE.
inc_st_omx = [inc_common]
dep_st_omx = [dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3]
dep_st_omx = [
dep_omx, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_libdrm,
]
files_omx = files(
'vid_dec_common.c',
......@@ -57,7 +59,7 @@ elif with_gallium_omx == 'tizonia'
inc_egl,
inc_egl_dri2,
]
dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
dep_st_omx = [dep_st_omx, dep_omx_other]
endif
libomx_st = static_library(
......
# Copyright © 2017-2018 Intel Corporation
# Copyright © 2017-2019 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
......@@ -35,5 +35,8 @@ libva_st = static_library(
),
],
include_directories : [inc_common],
dependencies : [dep_va_headers, 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,
dep_libdrm,
],
)
# Copyright © 2017 Intel Corproration
# Copyright © 2017, 2019 Intel Corproration
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
......@@ -35,5 +35,5 @@ libvdpau_st = static_library(
include_directories : [
inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux,
],
dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_xcb_dri2],
dependencies : [dep_vdpau, dep_xcb, dep_x11_xcb, dep_xcb_dri2, dep_libdrm],
)
# Copyright © 2017 Intel Corporation
# Copyright © 2017, 2019 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
......@@ -25,6 +25,7 @@ libxvmc_st = static_library(
include_directories : [inc_common],
dependencies : [
dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv,
dep_libdrm,
],
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment