mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-27 10:40:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: A couple for GIR-generation fixes

Browse source
This commit is contained in:
Rico Tzschichholz 2017-04-10 16:28:57 +02:00 committed by Tim-Philipp Müller
parent 15566bf505
commit 72e42f0ce9
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/meson.build
View file

@ -158,7 +158,7 @@ configure_file(input : 'gstconfig.h.in',
output : 'gstconfig.h', output : 'gstconfig.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : 'include/gstreamer-1.0/gst',
configuration : cdata) configuration : cdata)
configure_file(input : 'gstversion.h.in', gst_version_h = configure_file(input : 'gstversion.h.in',
output : 'gstversion.h', output : 'gstversion.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : 'include/gstreamer-1.0/gst',
configuration : cdata) configuration : cdata)
@ -233,7 +233,7 @@ if libtype != 'static'
gst_incdirs += [configinc] gst_incdirs += [configinc]
gst_gen_sources += [gnome.generate_gir(libgst_shared, gst_gen_sources += [gnome.generate_gir(libgst_shared,
sources : gst_sources + gst_headers, sources : gst_sources + gst_headers + gst_enums + [gst_version_h],
namespace : 'Gst', namespace : 'Gst',
nsversion : apiversion, nsversion : apiversion,
identifier_prefix : 'Gst', identifier_prefix : 'Gst',

3
libs/gst/base/meson.build
View file

@ -59,6 +59,7 @@ if libtype != 'static'
) )
gst_base = gst_base_shared gst_base = gst_base_shared
if build_gir if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/base/base.h' ]
gst_base_gen_sources += [gnome.generate_gir(gst_base_shared, gst_base_gen_sources += [gnome.generate_gir(gst_base_shared,
sources : gst_base_sources + gst_base_headers, sources : gst_base_sources + gst_base_headers,
namespace : 'GstBase', namespace : 'GstBase',
@ -70,7 +71,7 @@ if libtype != 'static'
include_directories : [configinc, libsinc, privinc], include_directories : [configinc, libsinc, privinc],
includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'],
install : true, install : true,
extra_args : gir_init_section, extra_args : gst_gir_extra_args,
)] )]
endif endif
endif endif

3
libs/gst/controller/meson.build
View file

@ -66,6 +66,7 @@ if libtype != 'static'
) )
gst_controller = gst_controller_shared gst_controller = gst_controller_shared
if build_gir if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/controller/controller.h' ]
gst_controller_gir = gnome.generate_gir(gst_controller_shared, gst_controller_gir = gnome.generate_gir(gst_controller_shared,
sources : gst_controller_sources + gst_controller_headers + [gstcontroller_h] + [gstcontroller_c], sources : gst_controller_sources + gst_controller_headers + [gstcontroller_h] + [gstcontroller_c],
namespace : 'GstController', namespace : 'GstController',
@ -77,7 +78,7 @@ if libtype != 'static'
include_directories : [configinc, libsinc, privinc], include_directories : [configinc, libsinc, privinc],
includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'],
install : true, install : true,
extra_args : gir_init_section, extra_args : gst_gir_extra_args,
) )
gst_controller_gen_sources += [gst_controller_gir] gst_controller_gen_sources += [gst_controller_gir]
endif endif

3
libs/gst/net/meson.build
View file

@ -45,6 +45,7 @@ if libtype != 'static'
) )
gst_net = gst_net_shared gst_net = gst_net_shared
if build_gir if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/net/net.h' ]
gst_net_gir = gnome.generate_gir(gst_net_shared, gst_net_gir = gnome.generate_gir(gst_net_shared,
sources : gst_net_sources + gst_net_headers, sources : gst_net_sources + gst_net_headers,
namespace : 'GstNet', namespace : 'GstNet',
@ -56,7 +57,7 @@ if libtype != 'static'
include_directories : [configinc, libsinc], include_directories : [configinc, libsinc],
includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gio-2.0', 'Gst-1.0'], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gio-2.0', 'Gst-1.0'],
install : true, install : true,
extra_args : gir_init_section, extra_args : gst_gir_extra_args,
) )
gst_net_gen_sources += [gst_net_gir] gst_net_gen_sources += [gst_net_gir]
endif endif