summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch35
1 files changed, 14 insertions, 21 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 2e1190ba01..08cbfb7c2a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -34,7 +34,7 @@ index 1ecc950..d6417ac 100644
34+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`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 \ 35 --library=libgstallocators-@GST_API_VERSION@.la \
36 --include=Gst-@GST_API_VERSION@ \ 36 --include=Gst-@GST_API_VERSION@ \
37 --libtool="$(LIBTOOL)" \ 37 --libtool="${LIBTOOL}" \
38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
39 $(INTROSPECTION_COMPILER) \ 39 $(INTROSPECTION_COMPILER) \
40 --includedir=$(srcdir) \ 40 --includedir=$(srcdir) \
@@ -63,7 +63,7 @@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
63index 7fb65f2..5379f79 100644 63index 7fb65f2..5379f79 100644
64--- a/gst-libs/gst/audio/Makefile.am 64--- a/gst-libs/gst/audio/Makefile.am
65+++ b/gst-libs/gst/audio/Makefile.am 65+++ b/gst-libs/gst/audio/Makefile.am
66@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE 66@@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
67 -I$(top_srcdir)/gst-libs \ 67 -I$(top_srcdir)/gst-libs \
68 -I$(top_builddir)/gst-libs \ 68 -I$(top_builddir)/gst-libs \
69 --c-include "gst/audio/audio.h" \ 69 --c-include "gst/audio/audio.h" \
@@ -80,7 +80,7 @@ index 7fb65f2..5379f79 100644
80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
81 --include=Gst-@GST_API_VERSION@ \ 81 --include=Gst-@GST_API_VERSION@ \
82 --include=GstBase-@GST_API_VERSION@ \ 82 --include=GstBase-@GST_API_VERSION@ \
83@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 83@@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
84 --includedir=$(srcdir) \ 84 --includedir=$(srcdir) \
85 --includedir=$(builddir) \ 85 --includedir=$(builddir) \
86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -95,7 +95,7 @@ diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
95index 3276d7f..0cdfe26 100644 95index 3276d7f..0cdfe26 100644
96--- a/gst-libs/gst/gl/Makefile.am 96--- a/gst-libs/gst/gl/Makefile.am
97+++ b/gst-libs/gst/gl/Makefile.am 97+++ b/gst-libs/gst/gl/Makefile.am
98@@ -186,9 +186,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ 98@@ -209,9 +209,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
99 $(GST_PLUGINS_BASE_CFLAGS) \ 99 $(GST_PLUGINS_BASE_CFLAGS) \
100 $(GL_CFLAGS) \ 100 $(GL_CFLAGS) \
101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ 101 --add-include-path="$(top_builddir)/gst-libs/gst/video/" \
@@ -107,7 +107,7 @@ index 3276d7f..0cdfe26 100644
107 --library=libgstgl-@GST_API_VERSION@.la \ 107 --library=libgstgl-@GST_API_VERSION@.la \
108 --include=Gst-@GST_API_VERSION@ \ 108 --include=Gst-@GST_API_VERSION@ \
109 --include=GstBase-@GST_API_VERSION@ \ 109 --include=GstBase-@GST_API_VERSION@ \
110@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 110@@ -241,8 +241,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
111 --includedir=$(srcdir) \ 111 --includedir=$(srcdir) \
112 --includedir=$(builddir) \ 112 --includedir=$(builddir) \
113 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 113 --includedir="$(top_builddir)/gst-libs/gst/video/" \
@@ -117,7 +117,7 @@ index 3276d7f..0cdfe26 100644
117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 117+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 118 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
119 119
120 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 120 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am 121diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
122index 35a6e44..49d6894 100644 122index 35a6e44..49d6894 100644
123--- a/gst-libs/gst/pbutils/Makefile.am 123--- a/gst-libs/gst/pbutils/Makefile.am
@@ -182,7 +182,7 @@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
182index 77ebeeb..9aee788 100644 182index 77ebeeb..9aee788 100644
183--- a/gst-libs/gst/rtp/Makefile.am 183--- a/gst-libs/gst/rtp/Makefile.am
184+++ b/gst-libs/gst/rtp/Makefile.am 184+++ b/gst-libs/gst/rtp/Makefile.am
185@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO 185@@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
186 --c-include "gst/rtp/rtp.h" \ 186 --c-include "gst/rtp/rtp.h" \
187 -I$(top_builddir)/gst-libs \ 187 -I$(top_builddir)/gst-libs \
188 -I$(top_srcdir)/gst-libs \ 188 -I$(top_srcdir)/gst-libs \
@@ -193,7 +193,7 @@ index 77ebeeb..9aee788 100644
193 --library=libgstrtp-@GST_API_VERSION@.la \ 193 --library=libgstrtp-@GST_API_VERSION@.la \
194 --include=Gst-@GST_API_VERSION@ \ 194 --include=Gst-@GST_API_VERSION@ \
195 --include=GstBase-@GST_API_VERSION@ \ 195 --include=GstBase-@GST_API_VERSION@ \
196@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 196@@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
197 $(INTROSPECTION_COMPILER) \ 197 $(INTROSPECTION_COMPILER) \
198 --includedir=$(srcdir) \ 198 --includedir=$(srcdir) \
199 --includedir=$(builddir) \ 199 --includedir=$(builddir) \
@@ -208,24 +208,17 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
208index db9d0fd..79027cb 100644 208index db9d0fd..79027cb 100644
209--- a/gst-libs/gst/rtsp/Makefile.am 209--- a/gst-libs/gst/rtsp/Makefile.am
210+++ b/gst-libs/gst/rtsp/Makefile.am 210+++ b/gst-libs/gst/rtsp/Makefile.am
211@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 211@@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
212 -I$(top_builddir)/gst-libs \ 212 -I$(top_builddir)/gst-libs \
213 -I$(top_srcdir)/gst-libs \ 213 -I$(top_srcdir)/gst-libs \
214 --add-include-path=$(builddir)/../sdp \ 214 --add-include-path=$(builddir)/../sdp \
215- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 215- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
216- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
216+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 217+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
218+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
217 --library=libgstrtsp-@GST_API_VERSION@.la \ 219 --library=libgstrtsp-@GST_API_VERSION@.la \
218 --include=Gio-2.0 \ 220 --include=Gio-2.0 \
219 --include=Gst-@GST_API_VERSION@ \ 221 --include=Gst-@GST_API_VERSION@ \
220@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
221 --includedir=$(srcdir) \
222 --includedir=$(builddir) \
223 --includedir=$(builddir)/../sdp \
224- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
225+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
226 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
227
228 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
229diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am 222diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
230index 6e05cc7..c7cf514 100644 223index 6e05cc7..c7cf514 100644
231--- a/gst-libs/gst/sdp/Makefile.am 224--- a/gst-libs/gst/sdp/Makefile.am
@@ -238,7 +231,7 @@ index 6e05cc7..c7cf514 100644
238+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`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@` \
239 --library=libgstsdp-@GST_API_VERSION@.la \ 232 --library=libgstsdp-@GST_API_VERSION@.la \
240 --include=Gst-@GST_API_VERSION@ \ 233 --include=Gst-@GST_API_VERSION@ \
241 --libtool="$(LIBTOOL)" \ 234 --libtool="${LIBTOOL}" \
242@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 235@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
243 $(INTROSPECTION_COMPILER) \ 236 $(INTROSPECTION_COMPILER) \
244 --includedir=$(srcdir) \ 237 --includedir=$(srcdir) \
@@ -278,7 +271,7 @@ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
278index 0f8455f..8c9955c 100644 271index 0f8455f..8c9955c 100644
279--- a/gst-libs/gst/video/Makefile.am 272--- a/gst-libs/gst/video/Makefile.am
280+++ b/gst-libs/gst/video/Makefile.am 273+++ b/gst-libs/gst/video/Makefile.am
281@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE 274@@ -124,8 +124,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
282 --c-include "gst/video/video.h" \ 275 --c-include "gst/video/video.h" \
283 -I$(top_srcdir)/gst-libs \ 276 -I$(top_srcdir)/gst-libs \
284 -I$(top_builddir)/gst-libs \ 277 -I$(top_builddir)/gst-libs \
@@ -289,7 +282,7 @@ index 0f8455f..8c9955c 100644
289 --library=libgstvideo-@GST_API_VERSION@.la \ 282 --library=libgstvideo-@GST_API_VERSION@.la \
290 --include=Gst-@GST_API_VERSION@ \ 283 --include=Gst-@GST_API_VERSION@ \
291 --include=GstBase-@GST_API_VERSION@ \ 284 --include=GstBase-@GST_API_VERSION@ \
292@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 285@@ -152,8 +152,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
293 $(INTROSPECTION_COMPILER) \ 286 $(INTROSPECTION_COMPILER) \
294 --includedir=$(srcdir) \ 287 --includedir=$(srcdir) \
295 --includedir=$(builddir) \ 288 --includedir=$(builddir) \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 22:34:55 +0000