From 0079aea21c4b85afad9b4ce3353e39c611e0e5c8 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 9 Nov 2016 14:07:28 -0300 Subject: [PATCH] meson: Advertise dependency on gst_dep generating girs And do not simply link to libgst as the gir information location only exist in declare_dependecy https://bugzilla.gnome.org/show_bug.cgi?id=774044 --- libs/gst/base/meson.build | 2 +- libs/gst/controller/meson.build | 2 +- libs/gst/net/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/meson.build b/libs/gst/base/meson.build index 8f31b410de..a232a87167 100644 --- a/libs/gst/base/meson.build +++ b/libs/gst/base/meson.build @@ -64,7 +64,7 @@ if libtype != 'static' identifier_prefix : 'Gst', symbol_prefix : 'gst', export_packages : 'gstreamer-base-1.0', - link_with : libgst_shared, + dependencies : [gst_dep], include_directories : [configinc, libsinc, privinc], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'], install : true, diff --git a/libs/gst/controller/meson.build b/libs/gst/controller/meson.build index 2ff95cdfa2..c3c7843936 100644 --- a/libs/gst/controller/meson.build +++ b/libs/gst/controller/meson.build @@ -49,7 +49,7 @@ if libtype != 'static' identifier_prefix : 'Gst', symbol_prefix : 'gst', export_packages : 'gstreamer-controller-1.0', - link_with : libgst_shared, + dependencies : [gst_dep], include_directories : [configinc, libsinc, privinc], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gst-1.0'], install : true, diff --git a/libs/gst/net/meson.build b/libs/gst/net/meson.build index dc9bdbc04b..160b44d04c 100644 --- a/libs/gst/net/meson.build +++ b/libs/gst/net/meson.build @@ -51,7 +51,7 @@ if libtype != 'static' identifier_prefix : 'Gst', symbol_prefix : 'gst', export_packages : 'gstreamer-net-1.0', - link_with : libgst_shared, + dependencies : [gst_dep, gst_base_dep], include_directories : [configinc, libsinc], includes : ['GLib-2.0', 'GObject-2.0', 'GModule-2.0', 'Gio-2.0', 'Gst-1.0'], install : true,