[Spice-devel] [PATCH spice-gtk 05/34] build-sys: fix gir/vapi warnings with GstPipeline

marcandre.lureau at redhat.com marcandre.lureau at redhat.com
Mon Jan 7 08:00:34 UTC 2019


From: Marc-André Lureau <marcandre.lureau at redhat.com>

Add required dependency on gstreamer to fix unresolved GstPipeline
type warning:

<unknown>:: Warning: SpiceClientGLib: (Signal)gst-video-overlay: argument pipeline: Unresolved type: 'GstPipeline'

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
---
 src/Makefile.am                 | 2 +-
 src/meson.build                 | 2 +-
 vapi/Makefile.am                | 2 ++
 vapi/meson.build                | 4 ++--
 vapi/spice-client-glib-2.0.deps | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b50c426..abc2f69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -540,7 +540,7 @@ gtk_introspection_files =				\
 	$(NULL)
 
 SpiceClientGLib-2.0.gir: libspice-client-glib-2.0.la
-SpiceClientGLib_2_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+SpiceClientGLib_2_0_gir_INCLUDES = GObject-2.0 Gio-2.0 GstBase-1.0
 SpiceClientGLib_2_0_gir_CFLAGS = $(SPICE_COMMON_CPPFLAGS)
 SpiceClientGLib_2_0_gir_LIBS = libspice-client-glib-2.0.la
 SpiceClientGLib_2_0_gir_FILES = $(glib_introspection_files)
diff --git a/src/meson.build b/src/meson.build
index a6f79bb..0057dfc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -208,7 +208,7 @@ spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
                                            export_packages : 'spice-client-glib-2.0',
                                            extra_args : ['--accept-unprefixed'],
                                            header : 'spice-client.h',
-                                           includes : ['GObject-2.0', 'Gio-2.0'],
+                                           includes : ['GObject-2.0', 'Gio-2.0', 'GstBase-1.0'],
                                            identifier_prefix : 'Spice',
                                            include_directories: spice_gtk_include,
                                            link_with : spice_client_glib_lib,
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 494ad83..3c6234d 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -27,6 +27,7 @@ spice-client-glib-2.0.vapi: $(top_builddir)/src/SpiceClientGLib-2.0.gir SpiceCli
 		--metadatadir=$(srcdir)		\
 		--library spice-client-glib-2.0	\
 		--pkg gio-2.0			\
+		--pkg gstreamer-1.0		\
 		$<
 
 spice-client-gtk-3.0.vapi: $(top_builddir)/src/SpiceClientGtk-3.0.gir spice-client-glib-2.0.vapi
@@ -34,6 +35,7 @@ spice-client-gtk-3.0.vapi: $(top_builddir)/src/SpiceClientGtk-3.0.gir spice-clie
 		--vapidir=$(builddir)					\
 		--girdir=$(top_builddir)/src				\
 		--pkg spice-client-glib-2.0				\
+		--pkg gstreamer-1.0					\
 		--pkg gtk+-3.0						\
 		--library spice-client-gtk-3.0				\
 		$<
diff --git a/vapi/meson.build b/vapi/meson.build
index de9adb9..2c4caa0 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -1,12 +1,12 @@
 if spice_gtk_has_vala
   gnome.generate_vapi('spice-client-glib-2.0',
                       install : true,
-                      packages : 'gio-2.0',
+                      packages : ['gio-2.0', 'gstreamer-1.0'],
                       sources : spice_client_glib_gir[0])
   if spice_gtk_has_gtk
     gnome.generate_vapi('spice-client-gtk-3.0',
                         install : true,
-                        packages : ['gtk+-3.0', 'spice-client-glib-2.0'],
+                        packages : ['gtk+-3.0', 'gstreamer-1.0', 'spice-client-glib-2.0'],
                         gir_dirs : join_paths(meson.build_root(), 'src'),
                         vapi_dirs : meson.current_build_dir(),
                         sources : spice_client_gtk_gir[0])
diff --git a/vapi/spice-client-glib-2.0.deps b/vapi/spice-client-glib-2.0.deps
index cd10dfd..64e63d2 100644
--- a/vapi/spice-client-glib-2.0.deps
+++ b/vapi/spice-client-glib-2.0.deps
@@ -1 +1,2 @@
 gio-2.0
+gstreamer-1.0
-- 
2.20.1.2.gb21ebb671b



More information about the Spice-devel mailing list