diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 295 |
1 files changed, 295 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch new file mode 100644 index 000000000..6616e2cf0 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | |||
| @@ -0,0 +1,295 @@ | |||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am | ||
| 24 | =================================================================== | ||
| 25 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am | ||
| 26 | +++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am | ||
| 27 | @@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I | ||
| 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 | @@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am | ||
| 46 | =================================================================== | ||
| 47 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am | ||
| 48 | +++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am | ||
| 49 | @@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am | ||
| 61 | =================================================================== | ||
| 62 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am | ||
| 63 | +++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am | ||
| 64 | @@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS | ||
| 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 | @@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am | ||
| 93 | =================================================================== | ||
| 94 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am | ||
| 95 | +++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am | ||
| 96 | @@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE | ||
| 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 | @@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am | ||
| 115 | =================================================================== | ||
| 116 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am | ||
| 117 | +++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am | ||
| 118 | @@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR | ||
| 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 | @@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am | ||
| 149 | =================================================================== | ||
| 150 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am | ||
| 151 | +++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am | ||
| 152 | @@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS | ||
| 153 | # --c-include "gst/riff/riff.h" \ | ||
| 154 | # --add-include-path=$(builddir)/../tag \ | ||
| 155 | # --add-include-path=$(builddir)/../audio \ | ||
| 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=libgstriff-@GST_API_VERSION@.la \ | ||
| 161 | # --include=GstAudio-@GST_API_VERSION@ \ | ||
| 162 | # --include=GstTag-@GST_API_VERSION@ \ | ||
| 163 | @@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS | ||
| 164 | # --includedir=$(builddir) \ | ||
| 165 | # --includedir=$(builddir)/../tag \ | ||
| 166 | # --includedir=$(builddir)/../audio \ | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am | ||
| 175 | =================================================================== | ||
| 176 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am | ||
| 177 | +++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am | ||
| 178 | @@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE | ||
| 179 | --c-include "gst/rtp/rtp.h" \ | ||
| 180 | -I$(top_builddir)/gst-libs \ | ||
| 181 | -I$(top_srcdir)/gst-libs \ | ||
| 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_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 184 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 185 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 186 | --library=libgstrtp-@GST_API_VERSION@.la \ | ||
| 187 | --include=Gst-@GST_API_VERSION@ \ | ||
| 188 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 189 | @@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 190 | $(INTROSPECTION_COMPILER) \ | ||
| 191 | --includedir=$(srcdir) \ | ||
| 192 | --includedir=$(builddir) \ | ||
| 193 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 194 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 195 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 196 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 197 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 198 | |||
| 199 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 200 | Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am | ||
| 201 | =================================================================== | ||
| 202 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am | ||
| 203 | +++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am | ||
| 204 | @@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP | ||
| 205 | -I$(top_builddir)/gst-libs \ | ||
| 206 | -I$(top_srcdir)/gst-libs \ | ||
| 207 | --add-include-path=$(builddir)/../sdp \ | ||
| 208 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 209 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 210 | --library=libgstrtsp-@GST_API_VERSION@.la \ | ||
| 211 | --include=Gio-2.0 \ | ||
| 212 | --include=Gst-@GST_API_VERSION@ \ | ||
| 213 | @@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 214 | --includedir=$(srcdir) \ | ||
| 215 | --includedir=$(builddir) \ | ||
| 216 | --includedir=$(builddir)/../sdp \ | ||
| 217 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 218 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 219 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 220 | |||
| 221 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 222 | Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am | ||
| 223 | =================================================================== | ||
| 224 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am | ||
| 225 | +++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am | ||
| 226 | @@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE | ||
| 227 | --warn-all \ | ||
| 228 | --c-include "gst/sdp/sdp.h" \ | ||
| 229 | -I$(top_srcdir)/gst-libs \ | ||
| 230 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 231 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 232 | --library=libgstsdp-@GST_API_VERSION@.la \ | ||
| 233 | --include=Gst-@GST_API_VERSION@ \ | ||
| 234 | --libtool="$(LIBTOOL)" \ | ||
| 235 | @@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 236 | $(INTROSPECTION_COMPILER) \ | ||
| 237 | --includedir=$(srcdir) \ | ||
| 238 | --includedir=$(builddir) \ | ||
| 239 | - --includedir=`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-@GST_API_VERSION@` \ | ||
| 241 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 242 | |||
| 243 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 244 | Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am | ||
| 245 | =================================================================== | ||
| 246 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am | ||
| 247 | +++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am | ||
| 248 | @@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE | ||
| 249 | --c-include "gst/tag/tag.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=libgsttag-@GST_API_VERSION@.la \ | ||
| 257 | --include=Gst-@GST_API_VERSION@ \ | ||
| 258 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 259 | @@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 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 | Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am | ||
| 271 | =================================================================== | ||
| 272 | --- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am | ||
| 273 | +++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am | ||
| 274 | @@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS | ||
| 275 | --c-include "gst/video/video.h" \ | ||
| 276 | -I$(top_srcdir)/gst-libs \ | ||
| 277 | -I$(top_builddir)/gst-libs \ | ||
| 278 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 279 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 280 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 281 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 282 | --library=libgstvideo-@GST_API_VERSION@.la \ | ||
| 283 | --include=Gst-@GST_API_VERSION@ \ | ||
| 284 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 285 | @@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= | ||
| 286 | $(INTROSPECTION_COMPILER) \ | ||
| 287 | --includedir=$(srcdir) \ | ||
| 288 | --includedir=$(builddir) \ | ||
| 289 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 290 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 291 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 292 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 293 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 294 | |||
| 295 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
