meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch

   1 From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Mon, 26 Oct 2015 16:38:18 +0200
   4 Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with
   5  PKG_CONFIG_SYSROOT_DIR
   6
   7 Upstream-Status: Pending [review on oe-core maillist]
   8 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
   9 ---
  10  gst-libs/gst/allocators/Makefile.am |  4 ++--
  11  gst-libs/gst/app/Makefile.am        |  4 ++--
  12  gst-libs/gst/audio/Makefile.am      | 12 ++++++------
  13  gst-libs/gst/fft/Makefile.am        |  4 ++--
  14  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------
  15  gst-libs/gst/riff/Makefile.am       |  8 ++++----
  16  gst-libs/gst/rtp/Makefile.am        |  8 ++++----
  17  gst-libs/gst/rtsp/Makefile.am       |  4 ++--
  18  gst-libs/gst/sdp/Makefile.am        |  4 ++--
  19  gst-libs/gst/tag/Makefile.am        |  8 ++++----
  20  gst-libs/gst/video/Makefile.am      |  8 ++++----
  21  11 files changed, 38 insertions(+), 38 deletions(-)
  22
  23 diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
  24 index bc7f53a..0ef5f86 100644
  25 --- a/gst-libs/gst/allocators/Makefile.am
  26 +++ b/gst-libs/gst/allocators/Makefile.am
  27 @@ -34,7 +34,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
  28                 --c-include "gst/allocators/allocators.h" \
  29                 -I$(top_srcdir)/gst-libs \
  30                 -I$(top_builddir)/gst-libs \
  31 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  32 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  33                 --library=libgstallocators-@GST_API_VERSION@.la \
  34                 --include=Gst-@GST_API_VERSION@ \
  35                 --libtool="$(LIBTOOL)" \
  36 @@ -58,7 +58,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  37                 $(INTROSPECTION_COMPILER) \
  38                 --includedir=$(srcdir) \
  39                 --includedir=$(builddir) \
  40 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  41 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  42                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  43
  44  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
  45 diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
  46 index dcc2fe0..dc076cb 100644
  47 --- a/gst-libs/gst/app/Makefile.am
  48 +++ b/gst-libs/gst/app/Makefile.am
  49 @@ -47,8 +47,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
  50                 --c-include "gst/app/app.h" \
  51                 -I$(top_srcdir)/gst-libs \
  52                 -I$(top_builddir)/gst-libs \
  53 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  54 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  55 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  56 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  57                 --library=libgstapp-@GST_API_VERSION@.la \
  58                 --include=Gst-@GST_API_VERSION@ \
  59                 --include=GstBase-@GST_API_VERSION@ \
  60 diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
  61 index 2374196..295eb42 100644
  62 --- a/gst-libs/gst/audio/Makefile.am
  63 +++ b/gst-libs/gst/audio/Makefile.am
  64 @@ -96,12 +96,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
  65                 -I$(top_srcdir)/gst-libs \
  66                 -I$(top_builddir)/gst-libs \
  67                 --c-include "gst/audio/audio.h" \
  68 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  69 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  70 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  71 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  72                 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
  73                 --library=libgstaudio-@GST_API_VERSION@.la \
  74 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
  75 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
  76 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
  77 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
  78                 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
  79                 --include=Gst-@GST_API_VERSION@ \
  80                 --include=GstBase-@GST_API_VERSION@ \
  81 @@ -130,8 +130,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  82                 --includedir=$(srcdir) \
  83                 --includedir=$(builddir) \
  84                 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
  85 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  86 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  87 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
  88 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
  89                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  90
  91  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
  92 diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
  93 index f545354..1bb6243 100644
  94 --- a/gst-libs/gst/fft/Makefile.am
  95 +++ b/gst-libs/gst/fft/Makefile.am
  96 @@ -61,7 +61,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
  97                 --c-include "gst/fft/fft.h" \
  98                 -I$(top_srcdir)/gst-libs \
  99                 -I$(top_builddir)/gst-libs \
 100 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 101 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 102                 --library=libgstfft-@GST_API_VERSION@.la \
 103                 --include=Gst-@GST_API_VERSION@ \
 104                 --libtool="$(LIBTOOL)" \
 105 @@ -85,7 +85,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 106                 $(INTROSPECTION_COMPILER) \
 107                 --includedir=$(srcdir) \
 108                 --includedir=$(builddir) \
 109 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 110 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 111                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 112
 113  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 114 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 115 index 91dc214..dc8e1d3 100644
 116 --- a/gst-libs/gst/pbutils/Makefile.am
 117 +++ b/gst-libs/gst/pbutils/Makefile.am
 118 @@ -79,14 +79,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
 119                 --c-include "gst/pbutils/pbutils.h" \
 120                 -I$(top_srcdir)/gst-libs \
 121                 -I$(top_builddir)/gst-libs \
 122 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 123 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 124 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 125 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 126                 --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \
 127                 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
 128                 --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \
 129                 --library=libgstpbutils-@GST_API_VERSION@.la \
 130 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 131 -               --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 132 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \
 133 +               --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \
 134                 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
 135                 --library-path="$(top_builddir)/gst-libs/gst/video/" \
 136                 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
 137 @@ -119,8 +119,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 138                 $(INTROSPECTION_COMPILER) \
 139                 --includedir=$(srcdir) \
 140                 --includedir=$(builddir) \
 141 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 142 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 143 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 144 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 145                 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
 146                 --includedir="$(top_builddir)/gst-libs/gst/video/" \
 147                 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
 148 diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
 149 index f5445c1..527c0b4 100644
 150 --- a/gst-libs/gst/rtp/Makefile.am
 151 +++ b/gst-libs/gst/rtp/Makefile.am
 152 @@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
 153                 --c-include "gst/rtp/rtp.h" \
 154                 -I$(top_builddir)/gst-libs \
 155                 -I$(top_srcdir)/gst-libs \
 156 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 157 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 158 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 159 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 160                 --library=libgstrtp-@GST_API_VERSION@.la \
 161                 --include=Gst-@GST_API_VERSION@ \
 162                 --include=GstBase-@GST_API_VERSION@ \
 163 @@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 164                 $(INTROSPECTION_COMPILER) \
 165                 --includedir=$(srcdir) \
 166                 --includedir=$(builddir) \
 167 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 168 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 169 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 170 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 171                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 172
 173  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 174 diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
 175 index 9b0b258..4f6d9f8 100644
 176 --- a/gst-libs/gst/rtsp/Makefile.am
 177 +++ b/gst-libs/gst/rtsp/Makefile.am
 178 @@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
 179                 -I$(top_builddir)/gst-libs \
 180                 -I$(top_srcdir)/gst-libs \
 181                 --add-include-path=$(builddir)/../sdp \
 182 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 183 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 184                 --library=libgstrtsp-@GST_API_VERSION@.la \
 185                 --include=Gio-2.0 \
 186                 --include=Gst-@GST_API_VERSION@ \
 187 @@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 188                 --includedir=$(srcdir) \
 189                 --includedir=$(builddir) \
 190                 --includedir=$(builddir)/../sdp \
 191 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 192 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 193                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 194
 195  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 196 diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
 197 index 0e149b8..9aa0512 100644
 198 --- a/gst-libs/gst/sdp/Makefile.am
 199 +++ b/gst-libs/gst/sdp/Makefile.am
 200 @@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
 201                 --warn-all \
 202                 --c-include "gst/sdp/sdp.h" \
 203                 -I$(top_srcdir)/gst-libs \
 204 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 205 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 206                 --library=libgstsdp-@GST_API_VERSION@.la \
 207                 --include=Gst-@GST_API_VERSION@ \
 208                 --libtool="$(LIBTOOL)" \
 209 @@ -52,7 +52,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 210                 $(INTROSPECTION_COMPILER) \
 211                 --includedir=$(srcdir) \
 212                 --includedir=$(builddir) \
 213 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 214 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 215                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 216
 217  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 218 diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
 219 index cafafd3..ba99279 100644
 220 --- a/gst-libs/gst/tag/Makefile.am
 221 +++ b/gst-libs/gst/tag/Makefile.am
 222 @@ -39,8 +39,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
 223                 --c-include "gst/tag/tag.h" \
 224                 -I$(top_srcdir)/gst-libs \
 225                 -I$(top_builddir)/gst-libs \
 226 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 227 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 228 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 229 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 230                 --library=libgsttag-@GST_API_VERSION@.la \
 231                 --include=Gst-@GST_API_VERSION@ \
 232                 --include=GstBase-@GST_API_VERSION@ \
 233 @@ -67,8 +67,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 234                 $(INTROSPECTION_COMPILER) \
 235                 --includedir=$(srcdir) \
 236                 --includedir=$(builddir) \
 237 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 238 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 239 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 240 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 241                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 242
 243  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 244 diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
 245 index ac64eb3..342c8c6 100644
 246 --- a/gst-libs/gst/video/Makefile.am
 247 +++ b/gst-libs/gst/video/Makefile.am
 248 @@ -108,8 +108,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
 249                 --c-include "gst/video/video.h" \
 250                 -I$(top_srcdir)/gst-libs \
 251                 -I$(top_builddir)/gst-libs \
 252 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 253 -               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 254 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 255 +               --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 256                 --library=libgstvideo-@GST_API_VERSION@.la \
 257                 --include=Gst-@GST_API_VERSION@ \
 258                 --include=GstBase-@GST_API_VERSION@ \
 259 @@ -136,8 +136,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 260                 $(INTROSPECTION_COMPILER) \
 261                 --includedir=$(srcdir) \
 262                 --includedir=$(builddir) \
 263 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 264 -               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 265 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 266 +               --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
 267                 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
 268
 269  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 270 --
 271 2.6.2
 272