mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 18:52:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

qroverlay: fix auto detection of json-glib for plugin

Browse source 
Only want to check for json-glib when libqrencode was found,
but also it shouldn't be required but depend on the option.

Fixes #1465

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1824>
This commit is contained in:
Tim-Philipp Müller 2020-11-20 13:22:48 +00:00
parent d1e7290109
commit 53947cad29
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/qroverlay/meson.build
View file

@ -1,14 +1,16 @@
qrencode_dep = dependency('libqrencode', required: get_option('qroverlay'))
json_dep = dependency('json-glib-1.0', fallback : ['json-glib', 'json_glib_dep'])
if qrencode_dep.found()
gstqroverlay = library('gstqroverlay', ['gstqroverlay.c', 'gstdebugqroverlay.c', 'gstbaseqroverlay.c'],
c_args : gst_plugins_bad_args,
include_directories : [configinc],
dependencies : [gstvideo_dep, qrencode_dep, json_dep],
install : true,
install_dir : plugins_install_dir,
)
pkgconfig.generate(gstqroverlay, install_dir : plugins_pkgconfig_install_dir)
plugins += [gstqroverlay]
json_dep = dependency('json-glib-1.0', fallback : ['json-glib', 'json_glib_dep'], required: get_option('qroverlay'))
if json_dep.found()
gstqroverlay = library('gstqroverlay', ['gstqroverlay.c', 'gstdebugqroverlay.c', 'gstbaseqroverlay.c'],
c_args : gst_plugins_bad_args,
include_directories : [configinc],
dependencies : [gstvideo_dep, qrencode_dep, json_dep],
install : true,
install_dir : plugins_install_dir,
)
pkgconfig.generate(gstqroverlay, install_dir : plugins_pkgconfig_install_dir)
plugins += [gstqroverlay]
endif
endif