From 006f8cea9629c13377de05fdcee7122940864c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 8 Dec 2019 00:00:37 +0000 Subject: [PATCH] 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. --- gst/typefind/meson.build | 11 +++++++++-- meson_options.txt | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gst/typefind/meson.build b/gst/typefind/meson.build index ad9853fea6..3c5a5d2785 100644 --- a/gst/typefind/meson.build +++ b/gst/typefind/meson.build @@ -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, ) diff --git a/meson_options.txt b/meson_options.txt index 73de93f0f1..ad519d5427 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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.') \ No newline at end of file + description: 'Enable documentation.')