From 4a60566999d984b411f068db285b711c83497f5a Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 5 Oct 2017 14:30:43 +0200 Subject: [PATCH] meson: Fix namespace and add some missing args in the gir generation --- gst-libs/gst/insertbin/meson.build | 2 +- gst-libs/gst/mpegts/meson.build | 6 +++--- gst-libs/gst/player/meson.build | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/insertbin/meson.build b/gst-libs/gst/insertbin/meson.build index 20d71c6..acf1805 100644 --- a/gst-libs/gst/insertbin/meson.build +++ b/gst-libs/gst/insertbin/meson.build @@ -24,7 +24,7 @@ if build_gir export_packages : 'gstreamer-insertbin-1.0', includes : ['Gst-1.0'], install : true, - extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'], + extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'] + ['--c-include=gst/insertbin/gstinsertbin.h'], dependencies : [gst_dep] ) gen_sources += insertbin_gir diff --git a/gst-libs/gst/mpegts/meson.build b/gst-libs/gst/mpegts/meson.build index ea430b3..3ff7735 100644 --- a/gst-libs/gst/mpegts/meson.build +++ b/gst-libs/gst/mpegts/meson.build @@ -47,12 +47,12 @@ if build_gir sources : mpegts_sources + mpegts_headers, namespace : 'GstMpegts', nsversion : api_version, - identifier_prefix : 'Gst', - symbol_prefix : 'gst', + identifier_prefix : 'GstMpegts', + symbol_prefix : 'gst_mpegts', #FIXME ['gst_mpegts', 'gst'], export_packages : 'gstreamer-mpegts-1.0', includes : ['Gst-1.0'], install : true, - extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'], + extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'] + ['--c-include=gst/mpegts/mpegts.h'], dependencies : [gst_dep] ) gen_sources += mpegts_gir diff --git a/gst-libs/gst/player/meson.build b/gst-libs/gst/player/meson.build index 5033d1a..57bc55b 100644 --- a/gst-libs/gst/player/meson.build +++ b/gst-libs/gst/player/meson.build @@ -46,7 +46,7 @@ if build_gir includes : ['Gst-1.0', 'GstPbutils-1.0', 'GstBase-1.0', 'GstVideo-1.0', 'GstAudio-1.0', 'GstTag-1.0'], install : true, - extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'], + extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'] + ['--c-include=gst/player/player.h'], dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep, gsttag_dep, gstpbutils_dep] ) -- 2.7.4