meson: Add some missing args and dependencies in the gir generation

This commit is contained in:
Rico Tzschichholz 2017-10-05 14:28:42 +02:00 committed by Tim-Philipp Müller
parent e81c334ca9
commit fb3455d7a1
3 changed files with 6 additions and 6 deletions

View file

@ -17,7 +17,7 @@ pbconf.set('PACKAGE_VERSION_MAJOR', gst_version_major)
pbconf.set('PACKAGE_VERSION_MINOR', gst_version_minor) pbconf.set('PACKAGE_VERSION_MINOR', gst_version_minor)
pbconf.set('PACKAGE_VERSION_MICRO', gst_version_micro) pbconf.set('PACKAGE_VERSION_MICRO', gst_version_micro)
pbconf.set('PACKAGE_VERSION_NANO', gst_version_nano) pbconf.set('PACKAGE_VERSION_NANO', gst_version_nano)
configure_file(input : 'gstpluginsbaseversion.h.in', gst_pbutils_version_h = configure_file(input : 'gstpluginsbaseversion.h.in',
output: 'gstpluginsbaseversion.h', output: 'gstpluginsbaseversion.h',
install_dir : 'include/gstreamer-1.0/gst/pbutils/', install_dir : 'include/gstreamer-1.0/gst/pbutils/',
configuration: pbconf) configuration: pbconf)
@ -63,17 +63,17 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
vs_module_defs: vs_module_defs_dir + 'libgstpbutils.def', vs_module_defs: vs_module_defs_dir + 'libgstpbutils.def',
) )
pbutils_gen_sources = [gstpbutils_h] pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
if build_gir if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ] gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
pbutils_gen_sources += [gnome.generate_gir(pbutils, pbutils_gen_sources += [gnome.generate_gir(pbutils,
sources : pbutils_sources + pbutils_headers + [gstpbutils_h], sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
namespace : 'GstPbutils', namespace : 'GstPbutils',
nsversion : api_version, nsversion : api_version,
identifier_prefix : 'Gst', identifier_prefix : 'Gst',
symbol_prefix : 'gst', symbol_prefix : 'gst',
export_packages : 'gstreamer-pbutils-1.0', export_packages : 'gstreamer-pbutils-1.0',
includes : ['Gst-1.0', 'GstBase-1.0'], includes : ['Gst-1.0', 'GstBase-1.0', 'GstAudio-1.0', 'GstVideo-1.0'],
install : true, install : true,
extra_args : gst_gir_extra_args, extra_args : gst_gir_extra_args,
dependencies : gstpbutils_deps dependencies : gstpbutils_deps

View file

@ -61,7 +61,7 @@ if build_gir
identifier_prefix : 'Gst', identifier_prefix : 'Gst',
symbol_prefix : 'gst', symbol_prefix : 'gst',
export_packages : 'gstreamer-tag-1.0', export_packages : 'gstreamer-tag-1.0',
includes : ['Gst-1.0'], includes : ['Gst-1.0', 'GstBase-1.0'],
install : true, install : true,
extra_args : gst_gir_extra_args, extra_args : gst_gir_extra_args,
dependencies : tag_deps dependencies : tag_deps

View file

@ -139,7 +139,7 @@ if build_gir
identifier_prefix : 'Gst', identifier_prefix : 'Gst',
symbol_prefix : 'gst', symbol_prefix : 'gst',
export_packages : 'gstreamer-video-1.0', export_packages : 'gstreamer-video-1.0',
includes : ['Gst-1.0', 'GLib-2.0', 'GObject-2.0', 'GModule-2.0' ], includes : ['Gst-1.0', 'GstBase-1.0'],
install : true, install : true,
extra_args : gst_gir_extra_args, extra_args : gst_gir_extra_args,
dependencies : gstvideo_deps dependencies : gstvideo_deps