mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: wayland: move dep checks to the lib

Browse source 
Moves them closer to where they are used.  We don't want every check in
the main meson.build file.
This commit is contained in:
Matthew Waters 2016-11-17 15:15:18 +11:00
parent 39b59beace
commit b69dadcc61
3 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/meson.build
View file

@ -10,7 +10,5 @@ subdir('interfaces')
subdir('mpegts')
subdir('player')
subdir('video')
if use_wayland
subdir('wayland')
endif
subdir('wayland')
subdir('gl')

34
gst-libs/gst/wayland/meson.build
View file

@ -1,13 +1,23 @@
gstwayland = library('gstwayland-' + api_version,
'wayland.c',
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
include_directories : [configinc, libsinc],
version : libversion,
soversion : soversion,
install : true,
dependencies : [gst_dep, gstvideo_dep]
)
wl_req = '>= 1.4'
wl_client_dep = dependency('wayland-client', version: wl_req, required: false)
libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required: false)
wl_protocol_dep = dependency('wayland-protocols', version: wl_req,
required: false)
wl_scanner = find_program('wayland-scanner')
use_wayland = wl_protocol_dep.found() and wl_client_dep.found() and wl_scanner.found() and libdrm_dep.found()
gstwayland_dep = declare_dependency(link_with : gstwayland,
include_directories : [libsinc],
dependencies : [gst_dep, gstvideo_dep])
if use_wayland
gstwayland = library('gstwayland-' + api_version,
'wayland.c',
c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
include_directories : [configinc, libsinc],
version : libversion,
soversion : soversion,
install : true,
dependencies : [gst_dep, gstvideo_dep]
)
gstwayland_dep = declare_dependency(link_with : gstwayland,
include_directories : [libsinc],
dependencies : [gst_dep, gstvideo_dep])
endif

10
meson.build
View file

@ -331,16 +331,6 @@ else
cdata.set('DISABLE_ORC', 1)
endif
# Wayland checks
wl_req = '>= 1.4'
wl_client_dep = dependency('wayland-client', version: wl_req, required: false)
libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required: false)
wl_protocol_dep = dependency('wayland-protocols', version: wl_req,
required: false)
wl_scanner = find_program('wayland-scanner')
use_wayland = wl_protocol_dep.found() and wl_client_dep.found() and wl_scanner.found() and libdrm_dep.found()
configure_file(input : 'config.h.meson',
output : 'config.h',
configuration : cdata)