From 30b305578095c1ef29f20836fa0e0a1d882c509f Mon Sep 17 00:00:00 2001
From: Thibault Saunier <thibault.saunier@osg.samsung.com>
Date: Thu, 10 Nov 2016 17:05:19 -0300
Subject: [PATCH] rtsp: Include GstSdp-1.0.gir when generating the gir

It is actually needed as we need some symbols. We do not link
to libgstsdp as the user of the lib should do it (same with
autotools build).

This reverts previous commit
---
 gst-libs/gst/meson.build      | 2 +-
 gst-libs/gst/rtsp/Makefile.am | 4 ++++
 gst-libs/gst/rtsp/meson.build | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gst-libs/gst/meson.build b/gst-libs/gst/meson.build
index 9f98006c64..dad943cce9 100644
--- a/gst-libs/gst/meson.build
+++ b/gst-libs/gst/meson.build
@@ -1,10 +1,10 @@
 subdir('tag')
 subdir('fft')
-subdir('rtsp')
 subdir('video')
 subdir('audio')
 subdir('rtp')
 subdir('sdp')
+subdir('rtsp')
 subdir('pbutils')
 subdir('riff')
 subdir('app')
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 74af695291..88f085375f 100644
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -67,13 +67,16 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 		--c-include "gst/rtsp/rtsp.h" \
 		-I$(top_builddir)/gst-libs \
 		-I$(top_srcdir)/gst-libs \
+		--add-include-path=$(builddir)/../sdp \
 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 		--library=libgstrtsp-@GST_API_VERSION@.la \
 		--include=Gio-2.0 \
 		--include=Gst-@GST_API_VERSION@ \
+		--include=GstSdp-@GST_API_VERSION@ \
 		--libtool="$(top_builddir)/libtool" \
 		--pkg gio-2.0 \
 		--pkg gstreamer-@GST_API_VERSION@ \
+		--pkg gstreamer-sdp-@GST_API_VERSION@ \
 		--pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
 		--add-init-section="$(INTROSPECTION_INIT)" \
 		--output $@ \
@@ -94,6 +97,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 		$(INTROSPECTION_COMPILER) \
 		--includedir=$(srcdir) \
 		--includedir=$(builddir) \
+		--includedir=$(builddir)/../sdp \
 		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 
diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
index b3106d9f3c..41601a2d6a 100644
--- a/gst-libs/gst/rtsp/meson.build
+++ b/gst-libs/gst/rtsp/meson.build
@@ -60,10 +60,10 @@ if build_gir
     identifier_prefix : 'Gst',
     symbol_prefix : 'gst',
     export_packages : 'gstreamer-rtsp-1.0',
-    includes : ['Gst-1.0', 'Gio-2.0'],
+    includes : ['Gst-1.0', 'GstSdp-1.0', 'Gio-2.0'],
     install : true,
     extra_args : gir_init_section,
-    dependencies : gstrtsp_deps
+    dependencies : gstrtsp_deps + [sdp_dep]
   )]
 endif