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

meson: gallium media state trackers require libdrm with x11

Browse source 
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 <eric.engestrom@intel.com>
This commit is contained in:
Dylan Baker 2019-05-09 10:32:31 -07:00
parent a0a93763fb
commit 3b265f61f5
5 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -1445,6 +1445,9 @@ if with_platform_x11
with_gallium_omx != 'disabled')) with_gallium_omx != 'disabled'))
dep_xcb = dependency('xcb') dep_xcb = dependency('xcb')
dep_x11_xcb = dependency('x11-xcb') dep_x11_xcb = dependency('x11-xcb')
if not dep_libdrm.found()
error('libdrm required for gallium video statetrackers when using x11')
endif
endif endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') 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') dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')

8
src/gallium/state_trackers/omx/meson.build
View file

@ -1,4 +1,4 @@
# Copyright © 2017 Intel Corporation # Copyright © 2017, 2019 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
@ -19,7 +19,9 @@
# SOFTWARE. # SOFTWARE.
inc_st_omx = [inc_common] 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( files_omx = files(
'vid_dec_common.c', 'vid_dec_common.c',
@ -57,7 +59,7 @@ elif with_gallium_omx == 'tizonia'
inc_egl, inc_egl,
inc_egl_dri2, inc_egl_dri2,
] ]
dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm] dep_st_omx = [dep_st_omx, dep_omx_other]
endif endif
libomx_st = static_library( libomx_st = static_library(

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

@ -1,4 +1,4 @@
# Copyright © 2017-2018 Intel Corporation # Copyright © 2017-2019 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
@ -35,5 +35,8 @@ libva_st = static_library(
), ),
], ],
include_directories : [inc_common], 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,
],
) )

4
src/gallium/state_trackers/vdpau/meson.build
View file

@ -1,4 +1,4 @@
# Copyright © 2017 Intel Corproration # Copyright © 2017, 2019 Intel Corproration
# 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
@ -35,5 +35,5 @@ libvdpau_st = static_library(
include_directories : [ include_directories : [
inc_include, inc_src, inc_util, inc_gallium, inc_gallium_aux, 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],
) )

3
src/gallium/state_trackers/xvmc/meson.build
View file

@ -1,4 +1,4 @@
# Copyright © 2017 Intel Corporation # Copyright © 2017, 2019 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
@ -25,6 +25,7 @@ libxvmc_st = static_library(
include_directories : [inc_common], include_directories : [inc_common],
dependencies : [ dependencies : [
dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv, dep_xvmc, dep_x11_xcb, dep_xcb, dep_xcb_dri2, dep_xcb_dri3, dep_xv,
dep_libdrm,
], ],
) )