23 changed files with 884 additions and 216 deletions
			
			
		| @ -1,11 +0,0 @@ | |||||
| --- gmediarender-0.0.6/src/output_gstreamer.c
 |  | ||||
| +++ gmediarender-0.0.6/src/output_gstreamer.c
 |  | ||||
| @@ -315,7 +315,7 @@
 |  | ||||
|   |  | ||||
|  	scan_mime_list(); |  | ||||
|   |  | ||||
| -	play = gst_element_factory_make("playbin", "play");
 |  | ||||
| +	play = gst_element_factory_make("playbin2", "play");
 |  | ||||
|   |  | ||||
|  	bus = gst_pipeline_get_bus(GST_PIPELINE(play)); |  | ||||
|  	gst_bus_add_watch(bus, my_bus_callback, NULL); |  | ||||
| @ -1,13 +0,0 @@ | |||||
| --- a/ext/hls/gsthlsdemux.c
 |  | ||||
| +++ b/ext/hls/gsthlsdemux.c
 |  | ||||
| @@ -595,6 +595,10 @@
 |  | ||||
|      return FALSE; |  | ||||
|    } |  | ||||
|   |  | ||||
| +  /* use max playlist quality if connection speed not set */
 |  | ||||
| +  if (demux->connection_speed == 0)
 |  | ||||
| +    demux->connection_speed = 4294967;
 |  | ||||
| +
 |  | ||||
|    /* select the initial variant stream */ |  | ||||
|    if (demux->connection_speed == 0) { |  | ||||
|      variant = hlsdemux->master->default_variant; |  | ||||
| @ -0,0 +1,71 @@ | |||||
|  | From ae7f7f6f53a264cabe324a3810599a66b357d3f2 Mon Sep 17 00:00:00 2001 | ||||
|  | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | Date: Sat, 19 Nov 2016 11:07:55 +0100 | ||||
|  | Subject: [PATCH] [PATCH] Makefile.am: don't hardcode libtool name when running | ||||
|  |   introspection tools | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending [review on oe-core list] | ||||
|  | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | 
 | ||||
|  | 	modified:   gst-libs/gst/gl/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/insertbin/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/mpegts/Makefile.am | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/gl/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/insertbin/Makefile.am | 2 +- | ||||
|  |  gst-libs/gst/mpegts/Makefile.am    | 2 +- | ||||
|  |  3 files changed, 3 insertions(+), 3 deletions(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
 | ||||
|  | index 68cc619..1ff5511 100644
 | ||||
|  | --- a/gst-libs/gst/gl/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/gl/Makefile.am
 | ||||
|  | @@ -172,7 +172,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
 | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstVideo-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-video-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
 | ||||
|  | index 1f8ea30..4b98ef6 100644
 | ||||
|  | --- a/gst-libs/gst/insertbin/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/insertbin/Makefile.am
 | ||||
|  | @@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
 | ||||
|  |  		--library=libgstinsertbin-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
 | ||||
|  | index aeea32e..929d9cc 100644
 | ||||
|  | --- a/gst-libs/gst/mpegts/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/mpegts/Makefile.am
 | ||||
|  | @@ -79,7 +79,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
 | ||||
|  |  		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||||
|  |  		--library=libgstmpegts-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-video-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ | ||||
|  | -- 
 | ||||
|  | 2.7.4 | ||||
|  | 
 | ||||
|  | --- a/gst-libs/gst/allocators/Makefile.am	2017-06-06 13:34:13.206127663 +0200
 | ||||
|  | +++ b/gst-libs/gst/allocators/Makefile.am	2017-06-06 13:34:44.395382923 +0200
 | ||||
|  | @@ -37,7 +37,7 @@
 | ||||
|  |  		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||||
|  |  		--library=libgstbadallocators-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-badallocators-@GST_API_VERSION@ \ | ||||
|  |  		--output $@ \ | ||||
| @ -0,0 +1,64 @@ | |||||
|  | From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001 | ||||
|  | From: Wenzong Fan <wenzong.fan@windriver.com> | ||||
|  | Date: Thu, 18 Sep 2014 02:24:07 -0400 | ||||
|  | Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2 | ||||
|  | 
 | ||||
|  | libssh2 is automatically linked to if present, this undetermined | ||||
|  | dependency may cause build errors like: | ||||
|  | 
 | ||||
|  |   .../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2 | ||||
|  | 
 | ||||
|  | libssh2 isn't an oe-core recipe, so allow to disable it from | ||||
|  | configure. | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending | ||||
|  | 
 | ||||
|  | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||||
|  | ---
 | ||||
|  |  configure.ac |   23 +++++++++++++++++------ | ||||
|  |  1 file changed, 17 insertions(+), 6 deletions(-) | ||||
|  | 
 | ||||
|  | diff --git a/configure.ac b/configure.ac
 | ||||
|  | index 0e95c5c..12153b4 100644
 | ||||
|  | --- a/configure.ac
 | ||||
|  | +++ b/configure.ac
 | ||||
|  | @@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], chromaprint, [
 | ||||
|  |  ]) | ||||
|  |   | ||||
|  |  dnl *** Curl *** | ||||
|  | +AC_ARG_ENABLE([libssh2],
 | ||||
|  | +     [  --enable-libssh2		enable LIBSSH2 support @<:@default=auto@:>@],
 | ||||
|  | +     [case "${enableval}" in
 | ||||
|  | +       yes)  NEED_SSH2=yes ;;
 | ||||
|  | +       no)   NEED_SSH2=no ;;
 | ||||
|  | +       auto) NEED_SSH2=auto ;;
 | ||||
|  | +       *) AC_MSG_ERROR([bad value ${enableval} for --enable-libssh2]) ;;
 | ||||
|  | +     esac],[NEED_SSH2=auto])
 | ||||
|  | +
 | ||||
|  |  translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) | ||||
|  |  AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ | ||||
|  |    PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [ | ||||
|  | @@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
 | ||||
|  |    ]) | ||||
|  |    AC_SUBST(CURL_CFLAGS) | ||||
|  |    AC_SUBST(CURL_LIBS) | ||||
|  | -  PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
 | ||||
|  | -    HAVE_SSH2="yes"
 | ||||
|  | -    AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
 | ||||
|  | -  ], [
 | ||||
|  | -    HAVE_SSH2="no"
 | ||||
|  | -  ])
 | ||||
|  | +  if test "x$NEED_SSH2" != "xno"; then
 | ||||
|  | +    PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
 | ||||
|  | +      HAVE_SSH2="yes"
 | ||||
|  | +      AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
 | ||||
|  | +    ], [
 | ||||
|  | +      HAVE_SSH2="no"
 | ||||
|  | +    ])
 | ||||
|  | +  fi
 | ||||
|  |    AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes") | ||||
|  |    AC_SUBST(SSH2_CFLAGS) | ||||
|  |    AC_SUBST(SSH2_LIBS) | ||||
|  | -- 
 | ||||
|  | 1.7.9.5 | ||||
|  | 
 | ||||
| @ -1,6 +1,6 @@ | |||||
| --- a/sys/dvb/gstdvbsrc.c
 | --- a/sys/dvb/gstdvbsrc.c	2016-12-16 21:52:42.691458624 +0100
 | ||||
| +++ b/sys/dvb/gstdvbsrc.c
 | +++ b/sys/dvb/gstdvbsrc.c	2016-12-16 21:54:05.192216253 +0100
 | ||||
| @@ -305,7 +305,9 @@
 | @@ -306,7 +306,9 @@
 | ||||
|      {APSK_16, "16APSK", "16apsk"}, |      {APSK_16, "16APSK", "16apsk"}, | ||||
|      {APSK_32, "32APSK", "32apsk"}, |      {APSK_32, "32APSK", "32apsk"}, | ||||
|      {DQPSK, "DQPSK", "dqpsk"}, |      {DQPSK, "DQPSK", "dqpsk"}, | ||||
| @ -0,0 +1,28 @@ | |||||
|  | From a67781000e82bd9ae3813da29401e8c0c852328a Mon Sep 17 00:00:00 2001 | ||||
|  | From: Andre McCurdy <armccurdy@gmail.com> | ||||
|  | Date: Tue, 26 Jan 2016 15:16:01 -0800 | ||||
|  | Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending | ||||
|  | 
 | ||||
|  | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- | ||||
|  |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
 | ||||
|  | index fd16ee0..ddb890c 100644
 | ||||
|  | --- a/gst-libs/gst/codecparsers/gstvc1parser.c
 | ||||
|  | +++ b/gst-libs/gst/codecparsers/gstvc1parser.c
 | ||||
|  | @@ -1729,7 +1729,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
 | ||||
|  |      GstVC1SeqLayer * seqlayer) | ||||
|  |  { | ||||
|  |    guint32 tmp; | ||||
|  | -  guint8 tmp8;
 | ||||
|  | +  guint8 tmp8 = 0;
 | ||||
|  |    guint8 structA[8] = { 0, }; | ||||
|  |    guint8 structB[12] = { 0, }; | ||||
|  |    GstBitReader br; | ||||
|  | -- 
 | ||||
|  | 1.9.1 | ||||
|  | 
 | ||||
| @ -0,0 +1,36 @@ | |||||
|  | From cb42f72318e284519cf155292f948a93383c09c6 Mon Sep 17 00:00:00 2001 | ||||
|  | From: christophecvr <stefansat@telenet.be> | ||||
|  | Date: Fri, 24 Feb 2017 14:34:33 +0100 | ||||
|  | Subject: [PATCH] Try-out continu in hls to avoid blocking of main thread. | ||||
|  | 
 | ||||
|  |  Looks like the error self was false, | ||||
|  |  If we just continue it retries,and | ||||
|  |  the media just continues to play ok. | ||||
|  |  The main advantage is that we avoid a  | ||||
|  |  main e2 thread blocked with stb freeze | ||||
|  |  as result. Even if the media would stop, | ||||
|  |  We do not have a frozen stb. | ||||
|  | 
 | ||||
|  | 	modified:   ext/hls/m3u8.c | ||||
|  | ---
 | ||||
|  |  ext/hls/m3u8.c | 4 ++-- | ||||
|  |  1 file changed, 2 insertions(+), 2 deletions(-) | ||||
|  | 
 | ||||
|  | diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
 | ||||
|  | index e85592e..5feef75 100644
 | ||||
|  | --- a/ext/hls/m3u8.c
 | ||||
|  | +++ b/ext/hls/m3u8.c
 | ||||
|  | @@ -365,8 +365,8 @@ gst_m3u8_update_check_consistent_media_seqnums (GstM3U8 * self,
 | ||||
|  |            } | ||||
|  |          } else if (g_str_equal (f1->uri, f2->uri)) { | ||||
|  |            /* Same URIs but different sequences, this is bad! */ | ||||
|  | -          GST_ERROR ("Media sequences inconsistent, ignoring");
 | ||||
|  | -          return FALSE;
 | ||||
|  | +          GST_ERROR ("Media sequences inconsistent, ignoring, but try anyway");
 | ||||
|  | +          //return FALSE;
 | ||||
|  |          } else { | ||||
|  |            /* Not same URI, not same sequence but by construction sequence | ||||
|  |             * must be higher in the new one. All good in that case, if it | ||||
|  | -- 
 | ||||
|  | 2.7.4 | ||||
|  | 
 | ||||
| @ -1,21 +0,0 @@ | |||||
| --- a/gst-libs/gst/riff/riff-media.c
 |  | ||||
| +++ b/gst-libs/gst/riff/riff-media.c
 |  | ||||
| @@ -466,12 +466,18 @@
 |  | ||||
|      case GST_MAKE_FOURCC ('F', 'M', 'P', '4'): |  | ||||
|      case GST_MAKE_FOURCC ('U', 'M', 'P', '4'): |  | ||||
|      case GST_MAKE_FOURCC ('F', 'F', 'D', 'S'): |  | ||||
| +    {
 |  | ||||
| +      gchar *fstr = g_strdup_printf ("%" GST_FOURCC_FORMAT,
 |  | ||||
| +          GST_FOURCC_ARGS (codec_fcc));
 |  | ||||
|        caps = gst_caps_new_simple ("video/mpeg", |  | ||||
|            "mpegversion", G_TYPE_INT, 4, |  | ||||
|            "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); |  | ||||
| +      gst_caps_set_simple (caps, "fourcc", G_TYPE_STRING, fstr, NULL);
 |  | ||||
| +      g_free (fstr);
 |  | ||||
|        if (codec_name) |  | ||||
|          *codec_name = g_strdup ("FFmpeg MPEG-4"); |  | ||||
|        break; |  | ||||
| +    }
 |  | ||||
|   |  | ||||
|      case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): |  | ||||
|      case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): |  | ||||
| @ -1,13 +0,0 @@ | |||||
| --- a/gst-libs/gst/riff/riff-media.c
 |  | ||||
| +++ b/gst-libs/gst/riff/riff-media.c
 |  | ||||
| @@ -497,6 +497,10 @@
 |  | ||||
|        caps = gst_caps_new_simple ("video/mpeg", |  | ||||
|            "mpegversion", G_TYPE_INT, 4, |  | ||||
|            "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); |  | ||||
| +      {gchar *fstr = g_strdup_printf ("%" GST_FOURCC_FORMAT,
 |  | ||||
| +          GST_FOURCC_ARGS (codec_fcc));
 |  | ||||
| +      gst_caps_set_simple (caps, "fourcc", G_TYPE_STRING, fstr, NULL);
 |  | ||||
| +      g_free (fstr);}
 |  | ||||
|        if (codec_name) |  | ||||
|          *codec_name = g_strdup ("MPEG-4"); |  | ||||
|        break; |  | ||||
| @ -1,36 +0,0 @@ | |||||
| --- a/gst-libs/gst/audio/gstaudiodecoder.c
 |  | ||||
| +++ b/gst-libs/gst/audio/gstaudiodecoder.c
 |  | ||||
| @@ -2289,6 +2289,15 @@
 |  | ||||
|              ("no valid frames found")); |  | ||||
|        } |  | ||||
|   |  | ||||
| +      /* send taglist if no valid frame is decoded util EOS */
 |  | ||||
| +      if (dec->priv->taglist && dec->priv->taglist_changed) {
 |  | ||||
| +        GST_DEBUG_OBJECT (dec, "codec tag %" GST_PTR_FORMAT, dec->priv->taglist);
 |  | ||||
| +        if (!gst_tag_list_is_empty (dec->priv->taglist))
 |  | ||||
| +          gst_audio_decoder_push_event (dec,
 |  | ||||
| +              gst_event_new_tag (gst_tag_list_ref (dec->priv->taglist)));
 |  | ||||
| +        dec->priv->taglist_changed = FALSE;
 |  | ||||
| +      }
 |  | ||||
| +
 |  | ||||
|        /* Forward EOS because no buffer or serialized event will come after |  | ||||
|         * EOS and nothing could trigger another _finish_frame() call. */ |  | ||||
|        if (dec->priv->pending_events) |  | ||||
| --- a/gst-libs/gst/video/gstvideodecoder.c
 |  | ||||
| +++ b/gst-libs/gst/video/gstvideodecoder.c
 |  | ||||
| @@ -1188,6 +1188,14 @@
 |  | ||||
|         * parent class' ::sink_event() until a later time. |  | ||||
|         */ |  | ||||
|        forward_immediate = TRUE; |  | ||||
| +
 |  | ||||
| +      /* send taglist if no valid frame is decoded util EOS */
 |  | ||||
| +      if (decoder->priv->tags && decoder->priv->tags_changed) {
 |  | ||||
| +        gst_video_decoder_push_event (decoder,
 |  | ||||
| +            gst_event_new_tag (gst_tag_list_ref (decoder->priv->tags)));
 |  | ||||
| +        decoder->priv->tags_changed = FALSE;
 |  | ||||
| +      }
 |  | ||||
| +
 |  | ||||
|        break; |  | ||||
|      } |  | ||||
|      case GST_EVENT_GAP: |  | ||||
| 
 |  | ||||
| @ -0,0 +1,180 @@ | |||||
|  | From 0c5843296bece8c298d5c8ca7342835f9fa9cbd6 Mon Sep 17 00:00:00 2001 | ||||
|  | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | Date: Sat, 19 Nov 2016 10:26:10 +0100 | ||||
|  | Subject: [PATCH] [PATCH 1/4] Makefile.am: don't hardcode libtool name when | ||||
|  |  running  introspection tools | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending [review on oe-core maillist] | ||||
|  | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | 
 | ||||
|  | 	modified:   gst-libs/gst/allocators/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/app/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/audio/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/fft/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/pbutils/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/riff/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/rtp/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/rtsp/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/sdp/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/tag/Makefile.am | ||||
|  | 	modified:   gst-libs/gst/video/Makefile.am | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/allocators/Makefile.am | 2 +- | ||||
|  |  gst-libs/gst/app/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/audio/Makefile.am      | 2 +- | ||||
|  |  gst-libs/gst/fft/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/pbutils/Makefile.am    | 2 +- | ||||
|  |  gst-libs/gst/riff/Makefile.am       | 2 +- | ||||
|  |  gst-libs/gst/rtp/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/rtsp/Makefile.am       | 2 +- | ||||
|  |  gst-libs/gst/sdp/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/tag/Makefile.am        | 2 +- | ||||
|  |  gst-libs/gst/video/Makefile.am      | 2 +- | ||||
|  |  11 files changed, 11 insertions(+), 11 deletions(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | index bccfdb3..c3a1cb8 100644
 | ||||
|  | --- a/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | @@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
 | ||||
|  |  		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||||
|  |  		--library=libgstallocators-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-allocators-@GST_API_VERSION@ \ | ||||
|  |  		--output $@ \ | ||||
|  | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
 | ||||
|  | index 0033371..1869540 100644
 | ||||
|  | --- a/gst-libs/gst/app/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/app/Makefile.am
 | ||||
|  | @@ -42,7 +42,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
 | ||||
|  |  		--library=libgstapp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-app-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
 | ||||
|  | index 41f9c4d..c39c529 100644
 | ||||
|  | --- a/gst-libs/gst/audio/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/audio/Makefile.am
 | ||||
|  | @@ -174,7 +174,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
 | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstTag-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-audio-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
 | ||||
|  | index 0d70422..2ded9ee 100644
 | ||||
|  | --- a/gst-libs/gst/fft/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/fft/Makefile.am
 | ||||
|  | @@ -66,7 +66,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
 | ||||
|  |  		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||||
|  |  		--library=libgstfft-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-fft-@GST_API_VERSION@ \ | ||||
|  |  		--output $@ \ | ||||
|  | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | index c5a25ca..44be19b 100644
 | ||||
|  | --- a/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | @@ -100,7 +100,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
 | ||||
|  |  		--include=GstTag-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstVideo-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstAudio-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-tag-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-video-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
 | ||||
|  | index 5fa26e5..1cf0590 100644
 | ||||
|  | --- a/gst-libs/gst/riff/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/riff/Makefile.am
 | ||||
|  | @@ -48,7 +48,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 | ||||
|  |  #		--include=GstAudio-@GST_API_VERSION@ \ | ||||
|  |  #		--include=GstTag-@GST_API_VERSION@ \ | ||||
|  |  #		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -#		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +#		--libtool="$(LIBTOOL)" \
 | ||||
|  |  #		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  #		--pkg gstreamer-tag-@GST_API_VERSION@ \ | ||||
|  |  #		--pkg gstreamer-audio-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | index 04b1f90..85085dc 100644
 | ||||
|  | --- a/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | @@ -66,7 +66,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 | ||||
|  |  		--library=libgstrtp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-rtp-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | index 88f0853..92b5e81 100644
 | ||||
|  | --- a/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | @@ -73,7 +73,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 | ||||
|  |  		--include=Gio-2.0 \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstSdp-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gio-2.0 \ | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-sdp-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | index 6fd9693..e356b16 100644
 | ||||
|  | --- a/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | @@ -33,7 +33,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 | ||||
|  |  		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||||
|  |  		--library=libgstsdp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-sdp-@GST_API_VERSION@ \ | ||||
|  |  		--output $@ \ | ||||
|  | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 | ||||
|  | index c0c2d6b..490ed40 100644
 | ||||
|  | --- a/gst-libs/gst/tag/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/tag/Makefile.am
 | ||||
|  | @@ -46,7 +46,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 | ||||
|  |  		--library=libgsttag-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-tag-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 | ||||
|  | index 64f4978..f3ea4ea 100644
 | ||||
|  | --- a/gst-libs/gst/video/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/video/Makefile.am
 | ||||
|  | @@ -121,7 +121,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 | ||||
|  |  		--library=libgstvideo-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | -		--libtool="$(top_builddir)/libtool" \
 | ||||
|  | +		--libtool="$(LIBTOOL)" \
 | ||||
|  |  		--pkg gstreamer-@GST_API_VERSION@ \ | ||||
|  |  		--pkg gstreamer-base-@GST_API_VERSION@ \ | ||||
|  |  		--pkg-export gstreamer-video-@GST_API_VERSION@ \ | ||||
|  | -- 
 | ||||
|  | 2.7.4 | ||||
|  | 
 | ||||
| @ -0,0 +1,298 @@ | |||||
|  | From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 | ||||
|  | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | Date: Mon, 26 Oct 2015 16:38:18 +0200 | ||||
|  | Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with | ||||
|  |  PKG_CONFIG_SYSROOT_DIR | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending [review on oe-core maillist] | ||||
|  | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/allocators/Makefile.am |  4 ++-- | ||||
|  |  gst-libs/gst/app/Makefile.am        |  4 ++-- | ||||
|  |  gst-libs/gst/audio/Makefile.am      | 12 ++++++------ | ||||
|  |  gst-libs/gst/fft/Makefile.am        |  4 ++-- | ||||
|  |  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------ | ||||
|  |  gst-libs/gst/riff/Makefile.am       |  8 ++++---- | ||||
|  |  gst-libs/gst/rtp/Makefile.am        |  8 ++++---- | ||||
|  |  gst-libs/gst/rtsp/Makefile.am       |  4 ++-- | ||||
|  |  gst-libs/gst/sdp/Makefile.am        |  4 ++-- | ||||
|  |  gst-libs/gst/tag/Makefile.am        |  8 ++++---- | ||||
|  |  gst-libs/gst/video/Makefile.am      |  8 ++++---- | ||||
|  |  11 files changed, 38 insertions(+), 38 deletions(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | index bc7f53a..0ef5f86 100644
 | ||||
|  | --- a/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/allocators/Makefile.am
 | ||||
|  | @@ -34,7 +34,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
 | ||||
|  |  		--c-include "gst/allocators/allocators.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstallocators-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--libtool="$(LIBTOOL)" \ | ||||
|  | @@ -58,7 +58,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
 | ||||
|  | index dcc2fe0..dc076cb 100644
 | ||||
|  | --- a/gst-libs/gst/app/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/app/Makefile.am
 | ||||
|  | @@ -47,8 +47,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
 | ||||
|  |  		--c-include "gst/app/app.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstapp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
 | ||||
|  | index 2374196..295eb42 100644
 | ||||
|  | --- a/gst-libs/gst/audio/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/audio/Makefile.am
 | ||||
|  | @@ -96,12 +96,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
 | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  |  		--c-include "gst/audio/audio.h" \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  |  		--library=libgstaudio-@GST_API_VERSION@.la \ | ||||
|  | -		--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | -		--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  | +		--library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | @@ -130,8 +130,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  |  		--includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
 | ||||
|  | index f545354..1bb6243 100644
 | ||||
|  | --- a/gst-libs/gst/fft/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/fft/Makefile.am
 | ||||
|  | @@ -61,7 +61,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
 | ||||
|  |  		--c-include "gst/fft/fft.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstfft-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--libtool="$(LIBTOOL)" \ | ||||
|  | @@ -85,7 +85,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | index 91dc214..dc8e1d3 100644
 | ||||
|  | --- a/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/pbutils/Makefile.am
 | ||||
|  | @@ -79,14 +79,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
 | ||||
|  |  		--c-include "gst/pbutils/pbutils.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  |  		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \ | ||||
|  |  		--add-include-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||||
|  |  		--library=libgstpbutils-@GST_API_VERSION@.la \ | ||||
|  | -		--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | -		--library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  | +		--library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  |  		--library-path="$(top_builddir)/gst-libs/gst/video/" \ | ||||
|  |  		--library-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||||
|  | @@ -119,8 +119,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||||
|  |  		--includedir="$(top_builddir)/gst-libs/gst/video/" \ | ||||
|  |  		--includedir="$(top_builddir)/gst-libs/gst/audio/" \ | ||||
|  | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
 | ||||
|  | index 3bd8fc0..0a115cc 100644
 | ||||
|  | --- a/gst-libs/gst/riff/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/riff/Makefile.am
 | ||||
|  | @@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 | ||||
|  |  #		--c-include "gst/riff/riff.h" \ | ||||
|  |  #		--add-include-path=$(builddir)/../tag \ | ||||
|  |  #		--add-include-path=$(builddir)/../audio \ | ||||
|  | -#		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +#		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +#		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  #		--library=libgstriff-@GST_API_VERSION@.la \ | ||||
|  |  #		--include=GstAudio-@GST_API_VERSION@ \ | ||||
|  |  #		--include=GstTag-@GST_API_VERSION@ \ | ||||
|  | @@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
 | ||||
|  |  #		--includedir=$(builddir) \ | ||||
|  |  #		--includedir=$(builddir)/../tag \ | ||||
|  |  #		--includedir=$(builddir)/../audio \ | ||||
|  | -#		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +#		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +#		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  #		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |  # | ||||
|  |  #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | index f5445c1..527c0b4 100644
 | ||||
|  | --- a/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/rtp/Makefile.am
 | ||||
|  | @@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 | ||||
|  |  		--c-include "gst/rtp/rtp.h" \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstrtp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | @@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | index 9b0b258..4f6d9f8 100644
 | ||||
|  | --- a/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | @@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 | ||||
|  |  		-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@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`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@ \ | ||||
|  | @@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  |  		--includedir=$(builddir)/../sdp \ | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | index 0e149b8..9aa0512 100644
 | ||||
|  | --- a/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/sdp/Makefile.am
 | ||||
|  | @@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 | ||||
|  |  		--warn-all \ | ||||
|  |  		--c-include "gst/sdp/sdp.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  | -		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstsdp-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--libtool="$(LIBTOOL)" \ | ||||
|  | @@ -52,7 +52,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 | ||||
|  | index cafafd3..ba99279 100644
 | ||||
|  | --- a/gst-libs/gst/tag/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/tag/Makefile.am
 | ||||
|  | @@ -39,8 +39,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 | ||||
|  |  		--c-include "gst/tag/tag.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgsttag-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | @@ -67,8 +67,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 | ||||
|  | index ac64eb3..342c8c6 100644
 | ||||
|  | --- a/gst-libs/gst/video/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/video/Makefile.am
 | ||||
|  | @@ -108,8 +108,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 | ||||
|  |  		--c-include "gst/video/video.h" \ | ||||
|  |  		-I$(top_srcdir)/gst-libs \ | ||||
|  |  		-I$(top_builddir)/gst-libs \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		--library=libgstvideo-@GST_API_VERSION@.la \ | ||||
|  |  		--include=Gst-@GST_API_VERSION@ \ | ||||
|  |  		--include=GstBase-@GST_API_VERSION@ \ | ||||
|  | @@ -136,8 +136,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 | ||||
|  |  		$(INTROSPECTION_COMPILER) \ | ||||
|  |  		--includedir=$(srcdir) \ | ||||
|  |  		--includedir=$(builddir) \ | ||||
|  | -		--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-base-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 | ||||
|  | +		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 | ||||
|  |  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||||
|  |   | ||||
|  |  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||||
|  | -- 
 | ||||
|  | 2.6.2 | ||||
|  | 
 | ||||
| @ -0,0 +1,48 @@ | |||||
|  | From e83999345bfcb3ac0290a88293ebdf16199b31a3 Mon Sep 17 00:00:00 2001 | ||||
|  | From: christophecvr <stefansat@telenet.be> | ||||
|  | Date: Sat, 5 Dec 2015 19:32:32 +0100 | ||||
|  | Subject: [PATCH] riff-media: added fourcc to all mpeg4 video caps | ||||
|  | 
 | ||||
|  | 	modified:   gst-libs/gst/riff/riff-media.c | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/riff/riff-media.c | 11 +++++++++++ | ||||
|  |  1 file changed, 11 insertions(+) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
 | ||||
|  | index 38e9e1a..8701fb2 100644
 | ||||
|  | --- a/gst-libs/gst/riff/riff-media.c
 | ||||
|  | +++ b/gst-libs/gst/riff/riff-media.c
 | ||||
|  | @@ -456,12 +456,19 @@ gst_riff_create_video_caps (guint32 codec_fcc,
 | ||||
|  |      case GST_MAKE_FOURCC ('F', 'M', 'P', '4'): | ||||
|  |      case GST_MAKE_FOURCC ('U', 'M', 'P', '4'): | ||||
|  |      case GST_MAKE_FOURCC ('F', 'F', 'D', 'S'): | ||||
|  | +    {
 | ||||
|  | +      gchar *fstr = NULL;
 | ||||
|  |        caps = gst_caps_new_simple ("video/mpeg", | ||||
|  |            "mpegversion", G_TYPE_INT, 4, | ||||
|  |            "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); | ||||
|  | +      fstr = g_strdup_printf ("%" GST_FOURCC_FORMAT,
 | ||||
|  | +          GST_FOURCC_ARGS (codec_fcc));
 | ||||
|  | +      gst_caps_set_simple (caps, "fourcc", G_TYPE_STRING, fstr, NULL);
 | ||||
|  | +      g_free (fstr);
 | ||||
|  |        if (codec_name) | ||||
|  |          *codec_name = g_strdup ("FFmpeg MPEG-4"); | ||||
|  |        break; | ||||
|  | +    }
 | ||||
|  |   | ||||
|  |      case GST_MAKE_FOURCC ('3', 'I', 'V', '1'): | ||||
|  |      case GST_MAKE_FOURCC ('3', 'I', 'V', '2'): | ||||
|  | @@ -487,6 +494,10 @@ gst_riff_create_video_caps (guint32 codec_fcc,
 | ||||
|  |        caps = gst_caps_new_simple ("video/mpeg", | ||||
|  |            "mpegversion", G_TYPE_INT, 4, | ||||
|  |            "systemstream", G_TYPE_BOOLEAN, FALSE, NULL); | ||||
|  | +      {gchar *fstr = g_strdup_printf ("%" GST_FOURCC_FORMAT,
 | ||||
|  | +          GST_FOURCC_ARGS (codec_fcc));
 | ||||
|  | +      gst_caps_set_simple (caps, "fourcc", G_TYPE_STRING, fstr, NULL);
 | ||||
|  | +      g_free (fstr);}
 | ||||
|  |        if (codec_name) | ||||
|  |          *codec_name = g_strdup ("MPEG-4"); | ||||
|  |        break; | ||||
|  | -- 
 | ||||
|  | 1.9.1 | ||||
|  | 
 | ||||
| @ -0,0 +1,27 @@ | |||||
|  | From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 | ||||
|  | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | Date: Mon, 26 Oct 2015 17:30:14 +0200 | ||||
|  | Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in | ||||
|  |  Makefile.am | ||||
|  | 
 | ||||
|  | Upstream-Status: Pending [review on oe-core maillist] | ||||
|  | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||||
|  | ---
 | ||||
|  |  gst-libs/gst/rtsp/Makefile.am | 1 - | ||||
|  |  1 file changed, 1 deletion(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | index 4f6d9f8..0afa370 100644
 | ||||
|  | --- a/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | +++ b/gst-libs/gst/rtsp/Makefile.am
 | ||||
|  | @@ -74,7 +74,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 | ||||
|  |  		--libtool="$(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 $@ \ | ||||
|  | -- 
 | ||||
|  | 2.6.2 | ||||
|  | 
 | ||||
| @ -1,21 +0,0 @@ | |||||
| --- gst-fluendo-mpegdemux-0.10.69/src/gstmpegdefs.h
 |  | ||||
| +++ gst-fluendo-mpegdemux-0.10.69/src/gstmpegdefs.h
 |  | ||||
| @@ -156,6 +156,7 @@
 |  | ||||
|  #define ST_BD_AUDIO_AC3_TRUE_HD         0x83 |  | ||||
|  #define ST_BD_AUDIO_AC3_PLUS            0x84 |  | ||||
|  #define ST_BD_AUDIO_DTS_HD              0x85 |  | ||||
| +#define ST_BD_AUDIO_DTS_HD_MASTER_AUDIO 0x86
 |  | ||||
|  #define ST_BD_AUDIO_EAC3                0x87 |  | ||||
|  #define ST_BD_PGS_SUBPICTURE            0x90 |  | ||||
|  #define ST_BD_IGS                       0x91 |  | ||||
| --- gst-fluendo-mpegdemux-0.10.69/src/gstmpegtsdemux.c
 |  | ||||
| +++ gst-fluendo-mpegdemux-0.10.69/src/gstmpegtsdemux.c
 |  | ||||
| @@ -850,6 +850,8 @@
 |  | ||||
|        break; |  | ||||
|      case ST_BD_AUDIO_DTS: |  | ||||
|      case ST_PS_AUDIO_DTS: |  | ||||
| +    case ST_BD_AUDIO_DTS_HD:
 |  | ||||
| +    case ST_BD_AUDIO_DTS_HD_MASTER_AUDIO:
 |  | ||||
|        template = klass->audio_template; |  | ||||
|        name = g_strdup_printf ("audio_%04x", stream->PID); |  | ||||
|        caps = gst_caps_new_simple ("audio/x-dts", NULL); |  | ||||
| @ -0,0 +1,62 @@ | |||||
|  | From c782a30482908a4b4dd9cd4abff9f9bc4016698f Mon Sep 17 00:00:00 2001 | ||||
|  | From: Song Bing <b06498@freescale.com> | ||||
|  | Date: Tue, 5 Aug 2014 14:40:46 +0800 | ||||
|  | Subject: [PATCH] gstrtpmp4gpay: set dafault value for MPEG4 without codec | ||||
|  |  data in caps. | ||||
|  | 
 | ||||
|  | https://bugzilla.gnome.org/show_bug.cgi?id=734263 | ||||
|  | 
 | ||||
|  | Upstream Status: Submitted | ||||
|  | 
 | ||||
|  | Signed-off-by: Song Bing <b06498@freescale.com> | ||||
|  | ---
 | ||||
|  |  gst/rtp/gstrtpmp4gpay.c |   19 ++++++++++++++++++- | ||||
|  |  1 file changed, 18 insertions(+), 1 deletion(-) | ||||
|  | 
 | ||||
|  | diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c
 | ||||
|  | index 7913d9a..1749d39 100644
 | ||||
|  | --- a/gst/rtp/gstrtpmp4gpay.c
 | ||||
|  | +++ b/gst/rtp/gstrtpmp4gpay.c
 | ||||
|  | @@ -390,6 +390,7 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
 | ||||
|  |    const GValue *codec_data; | ||||
|  |    const gchar *media_type = NULL; | ||||
|  |    gboolean res; | ||||
|  | +  const gchar *name;
 | ||||
|  |   | ||||
|  |    rtpmp4gpay = GST_RTP_MP4G_PAY (payload); | ||||
|  |   | ||||
|  | @@ -400,7 +401,6 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
 | ||||
|  |      GST_LOG_OBJECT (rtpmp4gpay, "got codec_data"); | ||||
|  |      if (G_VALUE_TYPE (codec_data) == GST_TYPE_BUFFER) { | ||||
|  |        GstBuffer *buffer; | ||||
|  | -      const gchar *name;
 | ||||
|  |   | ||||
|  |        buffer = gst_value_get_buffer (codec_data); | ||||
|  |        GST_LOG_OBJECT (rtpmp4gpay, "configuring codec_data"); | ||||
|  | @@ -426,6 +426,23 @@ gst_rtp_mp4g_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps)
 | ||||
|  |   | ||||
|  |        rtpmp4gpay->config = gst_buffer_copy (buffer); | ||||
|  |      } | ||||
|  | +  } else {
 | ||||
|  | +    name = gst_structure_get_name (structure);
 | ||||
|  | +
 | ||||
|  | +    if (!strcmp (name, "video/mpeg")) {
 | ||||
|  | +      rtpmp4gpay->profile = g_strdup ("1");
 | ||||
|  | +
 | ||||
|  | +      /* fixed rate */
 | ||||
|  | +      rtpmp4gpay->rate = 90000;
 | ||||
|  | +      /* video stream type */
 | ||||
|  | +      rtpmp4gpay->streamtype = "4";
 | ||||
|  | +      /* no params for video */
 | ||||
|  | +      rtpmp4gpay->params = NULL;
 | ||||
|  | +      /* mode */
 | ||||
|  | +      rtpmp4gpay->mode = "generic";
 | ||||
|  | +
 | ||||
|  | +      media_type = "video";
 | ||||
|  | +    }
 | ||||
|  |    } | ||||
|  |    if (media_type == NULL) | ||||
|  |      goto config_failed; | ||||
|  | -- 
 | ||||
|  | 1.7.9.5 | ||||
|  | 
 | ||||
| @ -1,21 +0,0 @@ | |||||
| --- a/tools/gst-inspect.c
 |  | ||||
| +++ b/tools/gst-inspect.c
 |  | ||||
| @@ -1548,7 +1548,7 @@
 |  | ||||
|    g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); |  | ||||
|    g_option_context_add_group (ctx, gst_init_get_option_group ()); |  | ||||
|    if (!g_option_context_parse (ctx, &argc, &argv, &err)) { |  | ||||
| -    g_printerr ("Error initializing: %s\n", err->message);
 |  | ||||
| +    g_printerr ("Error initializing: %s\n", err ? err->message : "(null)");
 |  | ||||
|      g_clear_error (&err); |  | ||||
|      g_option_context_free (ctx); |  | ||||
|      return -1; |  | ||||
| -------
 |  | ||||
|    g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); |  | ||||
|    g_option_context_add_group (ctx, gst_init_get_option_group ()); |  | ||||
|    if (!g_option_context_parse (ctx, &argc, &argv, &err)) { |  | ||||
| -    g_printerr ("Error initializing: %s\n", err->message);
 |  | ||||
| +    g_printerr ("Error initializing: %s\n", err ? err->message : "(null)");
 |  | ||||
|      return -1; |  | ||||
|    } |  | ||||
|    g_option_context_free (ctx); |  | ||||
| 
 |  | ||||
					Loading…
					
					
				
		Reference in new issue