From 3b265f61f5f61f08718fe5bb4b2726f9b8e016cc Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 9 May 2019 10:32:31 -0700 Subject: [PATCH] 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 Reviewed-by: Eric Engestrom --- meson.build | 3 +++ src/gallium/state_trackers/omx/meson.build | 8 +++++--- src/gallium/state_trackers/va/meson.build | 7 +++++-- src/gallium/state_trackers/vdpau/meson.build | 4 ++-- src/gallium/state_trackers/xvmc/meson.build | 3 ++- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index aea5c2e4444..9fe017d5455 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build index 382bf2ed23b..3aa82090c91 100644 --- a/src/gallium/state_trackers/omx/meson.build +++ b/src/gallium/state_trackers/omx/meson.build @@ -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 # 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( diff --git a/src/gallium/state_trackers/va/meson.build b/src/gallium/state_trackers/va/meson.build index eb1491ce451..84f788fdbaa 100644 --- a/src/gallium/state_trackers/va/meson.build +++ b/src/gallium/state_trackers/va/meson.build @@ -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 # 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, + ], ) diff --git a/src/gallium/state_trackers/vdpau/meson.build b/src/gallium/state_trackers/vdpau/meson.build index 28b98ae5369..28c4e9cab76 100644 --- a/src/gallium/state_trackers/vdpau/meson.build +++ b/src/gallium/state_trackers/vdpau/meson.build @@ -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 # 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], ) diff --git a/src/gallium/state_trackers/xvmc/meson.build b/src/gallium/state_trackers/xvmc/meson.build index 920b92ee19a..ab658fcad69 100644 --- a/src/gallium/state_trackers/xvmc/meson.build +++ b/src/gallium/state_trackers/xvmc/meson.build @@ -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 # 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, ], ) -- 2.30.2