diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 289 |
1 files changed, 289 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch new file mode 100644 index 00000000..4b6cfdd6 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | |||
@@ -0,0 +1,289 @@ | |||
1 | From e3f28d15e38f7633d8ed4023fe883b8377c0597e Mon Sep 17 00:00:00 2001 | ||
2 | From: Yuqing Zhu <carol.zhu@nxp.com> | ||
3 | Date: Fri, 20 Apr 2018 02:03:57 +0800 | ||
4 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with | ||
5 | PKG_CONFIG_SYSROOT_DIR | ||
6 | |||
7 | Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7 | ||
8 | |||
9 | Upstream-Status: Pending [review on oe-core maillist] | ||
10 | |||
11 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | ||
12 | --- | ||
13 | gst-libs/gst/allocators/Makefile.am | 4 ++-- | ||
14 | gst-libs/gst/app/Makefile.am | 8 ++++---- | ||
15 | gst-libs/gst/audio/Makefile.am | 12 ++++++------ | ||
16 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ | ||
17 | gst-libs/gst/riff/Makefile.am | 8 ++++---- | ||
18 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- | ||
19 | gst-libs/gst/rtsp/Makefile.am | 4 ++-- | ||
20 | gst-libs/gst/sdp/Makefile.am | 4 ++-- | ||
21 | gst-libs/gst/tag/Makefile.am | 8 ++++---- | ||
22 | gst-libs/gst/video/Makefile.am | 8 ++++---- | ||
23 | 10 files changed, 38 insertions(+), 38 deletions(-) | ||
24 | |||
25 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | ||
26 | index c4412a1..9f9d14d 100644 | ||
27 | --- a/gst-libs/gst/allocators/Makefile.am | ||
28 | +++ b/gst-libs/gst/allocators/Makefile.am | ||
29 | @@ -59,7 +59,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | ||
30 | --c-include "gst/allocators/allocators.h" \ | ||
31 | -I$(top_srcdir)/gst-libs \ | ||
32 | -I$(top_builddir)/gst-libs \ | ||
33 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
34 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
35 | --library=libgstallocators-@GST_API_VERSION@.la \ | ||
36 | --include=Gst-@GST_API_VERSION@ \ | ||
37 | --libtool="$(LIBTOOL)" \ | ||
38 | @@ -83,7 +83,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
39 | $(INTROSPECTION_COMPILER) \ | ||
40 | --includedir=$(srcdir) \ | ||
41 | --includedir=$(builddir) \ | ||
42 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
43 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
44 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
45 | |||
46 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
47 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | ||
48 | index 5bfd606..c231267 100644 | ||
49 | --- a/gst-libs/gst/app/Makefile.am | ||
50 | +++ b/gst-libs/gst/app/Makefile.am | ||
51 | @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | ||
52 | --c-include "gst/app/app.h" \ | ||
53 | -I$(top_srcdir)/gst-libs \ | ||
54 | -I$(top_builddir)/gst-libs \ | ||
55 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
56 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
57 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
58 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
59 | --library=libgstapp-@GST_API_VERSION@.la \ | ||
60 | --include=Gst-@GST_API_VERSION@ \ | ||
61 | --include=GstBase-@GST_API_VERSION@ \ | ||
62 | @@ -79,8 +79,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
63 | $(INTROSPECTION_COMPILER) \ | ||
64 | --includedir=$(srcdir) \ | ||
65 | --includedir=$(builddir) \ | ||
66 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
67 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
68 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
69 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
70 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
71 | |||
72 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
73 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | ||
74 | index 7fb65f2..5379f79 100644 | ||
75 | --- a/gst-libs/gst/audio/Makefile.am | ||
76 | +++ b/gst-libs/gst/audio/Makefile.am | ||
77 | @@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | ||
78 | -I$(top_srcdir)/gst-libs \ | ||
79 | -I$(top_builddir)/gst-libs \ | ||
80 | --c-include "gst/audio/audio.h" \ | ||
81 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
82 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
83 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
84 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
85 | --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
86 | --library=libgstaudio-@GST_API_VERSION@.la \ | ||
87 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
88 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
89 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
90 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
91 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
92 | --include=Gst-@GST_API_VERSION@ \ | ||
93 | --include=GstBase-@GST_API_VERSION@ \ | ||
94 | @@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
95 | --includedir=$(srcdir) \ | ||
96 | --includedir=$(builddir) \ | ||
97 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||
98 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
99 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
100 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
101 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
102 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
103 | |||
104 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
105 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | ||
106 | index 35a6e44..49d6894 100644 | ||
107 | --- a/gst-libs/gst/pbutils/Makefile.am | ||
108 | +++ b/gst-libs/gst/pbutils/Makefile.am | ||
109 | @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | ||
110 | --c-include "gst/pbutils/pbutils.h" \ | ||
111 | -I$(top_srcdir)/gst-libs \ | ||
112 | -I$(top_builddir)/gst-libs \ | ||
113 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
114 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
115 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
116 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
117 | --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
118 | --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
119 | --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||
120 | --library=libgstpbutils-@GST_API_VERSION@.la \ | ||
121 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
122 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
123 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
124 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
125 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
126 | --library-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
127 | --library-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||
128 | @@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
129 | $(INTROSPECTION_COMPILER) \ | ||
130 | --includedir=$(srcdir) \ | ||
131 | --includedir=$(builddir) \ | ||
132 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
133 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
134 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
135 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
136 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||
137 | --includedir="$(top_builddir)/gst-libs/gst/video/" \ | ||
138 | --includedir="$(top_builddir)/gst-libs/gst/audio/" \ | ||
139 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
140 | index e66ef4f..c8c588a 100644 | ||
141 | --- a/gst-libs/gst/riff/Makefile.am | ||
142 | +++ b/gst-libs/gst/riff/Makefile.am | ||
143 | @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
144 | # --c-include "gst/riff/riff.h" \ | ||
145 | # --add-include-path=$(builddir)/../tag \ | ||
146 | # --add-include-path=$(builddir)/../audio \ | ||
147 | -# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
148 | -# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
149 | +# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
150 | +# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
151 | # --library=libgstriff-@GST_API_VERSION@.la \ | ||
152 | # --include=GstAudio-@GST_API_VERSION@ \ | ||
153 | # --include=GstTag-@GST_API_VERSION@ \ | ||
154 | @@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
155 | # --includedir=$(builddir) \ | ||
156 | # --includedir=$(builddir)/../tag \ | ||
157 | # --includedir=$(builddir)/../audio \ | ||
158 | -# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
159 | -# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
160 | +# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
161 | +# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
162 | # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
163 | # | ||
164 | #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
165 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | ||
166 | index 77ebeeb..9aee788 100644 | ||
167 | --- a/gst-libs/gst/rtp/Makefile.am | ||
168 | +++ b/gst-libs/gst/rtp/Makefile.am | ||
169 | @@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | ||
170 | --c-include "gst/rtp/rtp.h" \ | ||
171 | -I$(top_builddir)/gst-libs \ | ||
172 | -I$(top_srcdir)/gst-libs \ | ||
173 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
174 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
175 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
176 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
177 | --library=libgstrtp-@GST_API_VERSION@.la \ | ||
178 | --include=Gst-@GST_API_VERSION@ \ | ||
179 | --include=GstBase-@GST_API_VERSION@ \ | ||
180 | @@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
181 | $(INTROSPECTION_COMPILER) \ | ||
182 | --includedir=$(srcdir) \ | ||
183 | --includedir=$(builddir) \ | ||
184 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
185 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
186 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
187 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
188 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
189 | |||
190 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
191 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
192 | index db9d0fd..79027cb 100644 | ||
193 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
194 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
195 | @@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
196 | -I$(top_builddir)/gst-libs \ | ||
197 | -I$(top_srcdir)/gst-libs \ | ||
198 | --add-include-path=$(builddir)/../sdp \ | ||
199 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
200 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
201 | --library=libgstrtsp-@GST_API_VERSION@.la \ | ||
202 | --include=Gio-2.0 \ | ||
203 | --include=Gst-@GST_API_VERSION@ \ | ||
204 | @@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
205 | --includedir=$(srcdir) \ | ||
206 | --includedir=$(builddir) \ | ||
207 | --includedir=$(builddir)/../sdp \ | ||
208 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
209 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
210 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
211 | |||
212 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
213 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | ||
214 | index 6e05cc7..c7cf514 100644 | ||
215 | --- a/gst-libs/gst/sdp/Makefile.am | ||
216 | +++ b/gst-libs/gst/sdp/Makefile.am | ||
217 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | ||
218 | --warn-all \ | ||
219 | --c-include "gst/sdp/sdp.h" \ | ||
220 | -I$(top_srcdir)/gst-libs \ | ||
221 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
222 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
223 | --library=libgstsdp-@GST_API_VERSION@.la \ | ||
224 | --include=Gst-@GST_API_VERSION@ \ | ||
225 | --libtool="$(LIBTOOL)" \ | ||
226 | @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
227 | $(INTROSPECTION_COMPILER) \ | ||
228 | --includedir=$(srcdir) \ | ||
229 | --includedir=$(builddir) \ | ||
230 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
231 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
232 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
233 | |||
234 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
235 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | ||
236 | index c86515b..363e6d2 100644 | ||
237 | --- a/gst-libs/gst/tag/Makefile.am | ||
238 | +++ b/gst-libs/gst/tag/Makefile.am | ||
239 | @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | ||
240 | --c-include "gst/tag/tag.h" \ | ||
241 | -I$(top_srcdir)/gst-libs \ | ||
242 | -I$(top_builddir)/gst-libs \ | ||
243 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
244 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
245 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
246 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
247 | --library=libgsttag-@GST_API_VERSION@.la \ | ||
248 | --include=Gst-@GST_API_VERSION@ \ | ||
249 | --include=GstBase-@GST_API_VERSION@ \ | ||
250 | @@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
251 | $(INTROSPECTION_COMPILER) \ | ||
252 | --includedir=$(srcdir) \ | ||
253 | --includedir=$(builddir) \ | ||
254 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
255 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
256 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
257 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
258 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
259 | |||
260 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
261 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
262 | index 0f7c07e..d642267 100644 | ||
263 | --- a/gst-libs/gst/video/Makefile.am | ||
264 | +++ b/gst-libs/gst/video/Makefile.am | ||
265 | @@ -121,8 +121,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | ||
266 | --c-include "gst/video/video.h" \ | ||
267 | -I$(top_srcdir)/gst-libs \ | ||
268 | -I$(top_builddir)/gst-libs \ | ||
269 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
270 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
271 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
272 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
273 | --library=libgstvideo-@GST_API_VERSION@.la \ | ||
274 | --include=Gst-@GST_API_VERSION@ \ | ||
275 | --include=GstBase-@GST_API_VERSION@ \ | ||
276 | @@ -149,8 +149,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
277 | $(INTROSPECTION_COMPILER) \ | ||
278 | --includedir=$(srcdir) \ | ||
279 | --includedir=$(builddir) \ | ||
280 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
281 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
282 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
283 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
284 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
285 | |||
286 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
287 | -- | ||
288 | 2.7.4 | ||
289 | |||