From: Tim-Philipp Müller Date: Tue, 22 Jan 2019 09:32:31 +0000 (+0000) Subject: meson: add options for ximagesrc xshm, xfixes, xdamage checks X-Git-Tag: 1.19.3~509^2~1203 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e234932dc703e51a0e1aa3b9c408f12758b12335;p=platform%2Fupstream%2Fgstreamer.git meson: add options for ximagesrc xshm, xfixes, xdamage checks And rename x11 option to ximagesrc. Fixes #553 --- diff --git a/meson_options.txt b/meson_options.txt index 44ef399..74b6b53 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -73,7 +73,12 @@ option('twolame', type : 'feature', value : 'auto', description : 'twolame mp2 a option('vpx', type : 'feature', value : 'auto', description : 'VP8 and VP9 video codec plugin') option('waveform', type : 'feature', value : 'auto', description : 'Windows waveform audio sink plugin') option('wavpack', type : 'feature', value : 'auto', description : 'Wavpack audio codec plugin') -option('x11', type : 'feature', value : 'auto', description : 'X11 ximagesrc plugin') + +# ximagesrc plugin options +option('ximagesrc', type : 'feature', value : 'auto', description : 'X11 ximagesrc plugin') +option('ximagesrc-xshm', type : 'feature', value : 'auto', description : 'X11 ximagesrc plugin (XSHM support)') +option('ximagesrc-xfixes', type : 'feature', value : 'auto', description : 'X11 ximagesrc plugin (XFixes support)') +option('ximagesrc-xdamage', type : 'feature', value : 'auto', description : 'X11 ximagesrc plugin (XDamage support)') # v4l2 plugin options option('v4l2', type : 'feature', value : 'auto', description : 'Build video4linux2 source/sink plugin') diff --git a/sys/ximage/meson.build b/sys/ximage/meson.build index 16d46a2..69926ec 100644 --- a/sys/ximage/meson.build +++ b/sys/ximage/meson.build @@ -1,19 +1,19 @@ -x11_dep = dependency('x11', required : get_option('x11')) +x11_dep = dependency('x11', required : get_option('ximagesrc')) if x11_dep.found() x_args = [] # FIXME: Need to check for XShmAttach inside libXext - xshm_dep = dependency('xext', required : false) + xshm_dep = dependency('xext', required : get_option('ximagesrc-xshm')) if xshm_dep.found() x_args += ['-DHAVE_XSHM'] endif - xfixes_dep = dependency('xfixes', required : false) + xfixes_dep = dependency('xfixes', required : get_option('ximagesrc-xfixes')) if xfixes_dep.found() x_args += ['-DHAVE_XFIXES'] endif - xdamage_dep = dependency('xdamage', required : false) + xdamage_dep = dependency('xdamage', required : get_option('ximagesrc-xdamage')) if xdamage_dep.found() x_args += ['-DHAVE_XDAMAGE'] endif