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
This commit is contained in:
Thibault Saunier 2016-11-10 17:05:19 -03:00
parent b42a9c0cde
commit 30b3055780
3 changed files with 7 additions and 3 deletions

View file

@ -1,10 +1,10 @@
subdir('tag') subdir('tag')
subdir('fft') subdir('fft')
subdir('rtsp')
subdir('video') subdir('video')
subdir('audio') subdir('audio')
subdir('rtp') subdir('rtp')
subdir('sdp') subdir('sdp')
subdir('rtsp')
subdir('pbutils') subdir('pbutils')
subdir('riff') subdir('riff')
subdir('app') subdir('app')

View file

@ -67,13 +67,16 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
--c-include "gst/rtsp/rtsp.h" \ --c-include "gst/rtsp/rtsp.h" \
-I$(top_builddir)/gst-libs \ -I$(top_builddir)/gst-libs \
-I$(top_srcdir)/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@` \ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
--library=libgstrtsp-@GST_API_VERSION@.la \ --library=libgstrtsp-@GST_API_VERSION@.la \
--include=Gio-2.0 \ --include=Gio-2.0 \
--include=Gst-@GST_API_VERSION@ \ --include=Gst-@GST_API_VERSION@ \
--include=GstSdp-@GST_API_VERSION@ \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gio-2.0 \ --pkg gio-2.0 \
--pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-@GST_API_VERSION@ \
--pkg gstreamer-sdp-@GST_API_VERSION@ \
--pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \
--add-init-section="$(INTROSPECTION_INIT)" \ --add-init-section="$(INTROSPECTION_INIT)" \
--output $@ \ --output $@ \
@ -94,6 +97,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
$(INTROSPECTION_COMPILER) \ $(INTROSPECTION_COMPILER) \
--includedir=$(srcdir) \ --includedir=$(srcdir) \
--includedir=$(builddir) \ --includedir=$(builddir) \
--includedir=$(builddir)/../sdp \
--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)

View file

@ -60,10 +60,10 @@ if build_gir
identifier_prefix : 'Gst', identifier_prefix : 'Gst',
symbol_prefix : 'gst', symbol_prefix : 'gst',
export_packages : 'gstreamer-rtsp-1.0', 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, install : true,
extra_args : gir_init_section, extra_args : gir_init_section,
dependencies : gstrtsp_deps dependencies : gstrtsp_deps + [sdp_dep]
)] )]
endif endif