meson: contain and check simple-dmabuf-egl deps

Check the egl, glesv2 and gbm dependencies locally instead of relying on
the dep_* variables from the top level meson.build or
libweston/meson.build (dep_gbm).

This should make these dependencies now explicitly checked when the app
is built, rather than relying on other components doing the checks. If
the drm-backend was disabled, this would have probably hit an error
using the undeclared variable dep_gbm.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
dev
Pekka Paalanen 6 years ago
parent a18bd3432d
commit 4b29ffddaa
  1. 8
      clients/meson.build
  2. 2
      meson.build

@ -61,11 +61,9 @@ simple_clients = [
], ],
'dep_objs': [ 'dep_objs': [
dep_wayland_client, dep_wayland_client,
dep_libdrm_headers, dep_libdrm_headers
dep_gbm, ],
dep_egl, 'deps': [ 'egl', 'glesv2', 'gbm' ]
dep_glesv2
]
}, },
{ {
'name': 'dmabuf-v4l', 'name': 'dmabuf-v4l',

@ -154,9 +154,7 @@ dep_libm = cc.find_library('m')
dep_libdl = cc.find_library('dl') dep_libdl = cc.find_library('dl')
dep_libdrm = dependency('libdrm', version: '>= 2.4.68') dep_libdrm = dependency('libdrm', version: '>= 2.4.68')
dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true) dep_libdrm_headers = dep_libdrm.partial_dependency(compile_args: true)
dep_egl = dependency('egl', required: false)
dep_wl_egl = dependency('wayland-egl') dep_wl_egl = dependency('wayland-egl')
dep_glesv2 = dependency('glesv2', required: false)
dep_threads = dependency('threads') dep_threads = dependency('threads')
subdir('protocol') subdir('protocol')

Loading…
Cancel
Save