typefindfunctions: build gio xdgmime typefinder again

And add gio-typefinder option to disable it. HAVE_GIO
was never set, at least not in the Meson build.
This commit is contained in:
Tim-Philipp Müller 2019-12-08 00:00:37 +00:00 committed by GStreamer Merge Bot
parent 574d097d43
commit 006f8cea96
2 changed files with 11 additions and 3 deletions

View file

@ -1,8 +1,15 @@
typefindfunctions_extra_defs = []
typefindfunctions_extra_deps = []
if not get_option('gio-typefinder').disabled()
typefindfunctions_extra_defs += ['-DHAVE_GIO']
typefindfunctions_extra_deps += [gio_dep]
endif
gsttypefind = library('gsttypefindfunctions',
'gsttypefindfunctions.c',
c_args : gst_plugins_base_args,
c_args : gst_plugins_base_args + typefindfunctions_extra_defs,
include_directories: [configinc, libsinc],
dependencies : [pbutils_dep, gst_base_dep],
dependencies : [pbutils_dep, gst_base_dep, typefindfunctions_extra_deps],
install : true,
install_dir : plugins_install_dir,
)

View file

@ -38,6 +38,7 @@ option('audiotestsrc', type : 'feature', value : 'auto')
option('compositor', type : 'feature', value : 'auto')
option('encoding', type : 'feature', value : 'auto')
option('gio', type : 'feature', value : 'auto')
option('gio-typefinder', type : 'feature', value : 'auto')
option('overlaycomposition', type : 'feature', value : 'auto')
option('pbtypes', type : 'feature', value : 'auto')
option('playback', type : 'feature', value : 'auto')
@ -85,4 +86,4 @@ option('package-name', type : 'string', yield : true,
option('package-origin', type : 'string', value : 'Unknown package origin', yield : true,
description : 'package origin URL to use in plugins')
option('doc', type : 'feature', value : 'auto', yield: true,
description: 'Enable documentation.')
description: 'Enable documentation.')