diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:02:02 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:45 +0000 |
commit | ac5cc0cee9edb9296c4bc066d6d91b8343d24a05 (patch) | |
tree | 5314492a1c0e3c809da1dddc24641df6d29212a6 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base | |
parent | 03cd714efc8aa949995ba6aea8e0d6d68d6c83b6 (diff) | |
download | poky-ac5cc0cee9edb9296c4bc066d6d91b8343d24a05.tar.gz |
gstreamer: enable gobject introspection
(From OE-Core rev: e70ed487b0f489e4d62b69476d364d7de54b79e2)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base')
4 files changed, 521 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch new file mode 100644 index 0000000000..781e4d8012 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | |||
@@ -0,0 +1,168 @@ | |||
1 | From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 20 Nov 2015 16:53:04 +0200 | ||
4 | Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running | ||
5 | introspection tools | ||
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 | 2 +- | ||
11 | gst-libs/gst/app/Makefile.am | 2 +- | ||
12 | gst-libs/gst/audio/Makefile.am | 2 +- | ||
13 | gst-libs/gst/fft/Makefile.am | 2 +- | ||
14 | gst-libs/gst/pbutils/Makefile.am | 2 +- | ||
15 | gst-libs/gst/riff/Makefile.am | 2 +- | ||
16 | gst-libs/gst/rtp/Makefile.am | 2 +- | ||
17 | gst-libs/gst/rtsp/Makefile.am | 2 +- | ||
18 | gst-libs/gst/sdp/Makefile.am | 2 +- | ||
19 | gst-libs/gst/tag/Makefile.am | 2 +- | ||
20 | gst-libs/gst/video/Makefile.am | 2 +- | ||
21 | 11 files changed, 11 insertions(+), 11 deletions(-) | ||
22 | |||
23 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | ||
24 | index 9361bf9..bc7f53a 100644 | ||
25 | --- a/gst-libs/gst/allocators/Makefile.am | ||
26 | +++ b/gst-libs/gst/allocators/Makefile.am | ||
27 | @@ -37,7 +37,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | ||
28 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
29 | --library=libgstallocators-@GST_API_VERSION@.la \ | ||
30 | --include=Gst-@GST_API_VERSION@ \ | ||
31 | - --libtool="$(top_builddir)/libtool" \ | ||
32 | + --libtool="$(LIBTOOL)" \ | ||
33 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
34 | --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ | ||
35 | --output $@ \ | ||
36 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | ||
37 | index 6d6de8d..dcc2fe0 100644 | ||
38 | --- a/gst-libs/gst/app/Makefile.am | ||
39 | +++ b/gst-libs/gst/app/Makefile.am | ||
40 | @@ -52,7 +52,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | ||
41 | --library=libgstapp-@GST_API_VERSION@.la \ | ||
42 | --include=Gst-@GST_API_VERSION@ \ | ||
43 | --include=GstBase-@GST_API_VERSION@ \ | ||
44 | - --libtool="$(top_builddir)/libtool" \ | ||
45 | + --libtool="$(LIBTOOL)" \ | ||
46 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
47 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
48 | --pkg-export gstreamer-app-@GST_API_VERSION@ \ | ||
49 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | ||
50 | index 275d222..2374196 100644 | ||
51 | --- a/gst-libs/gst/audio/Makefile.am | ||
52 | +++ b/gst-libs/gst/audio/Makefile.am | ||
53 | @@ -106,7 +106,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | ||
54 | --include=Gst-@GST_API_VERSION@ \ | ||
55 | --include=GstBase-@GST_API_VERSION@ \ | ||
56 | --include=GstTag-@GST_API_VERSION@ \ | ||
57 | - --libtool="$(top_builddir)/libtool" \ | ||
58 | + --libtool="$(LIBTOOL)" \ | ||
59 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
60 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
61 | --pkg-export gstreamer-audio-@GST_API_VERSION@ \ | ||
62 | diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am | ||
63 | index 09b3d68..f545354 100644 | ||
64 | --- a/gst-libs/gst/fft/Makefile.am | ||
65 | +++ b/gst-libs/gst/fft/Makefile.am | ||
66 | @@ -64,7 +64,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO | ||
67 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
68 | --library=libgstfft-@GST_API_VERSION@.la \ | ||
69 | --include=Gst-@GST_API_VERSION@ \ | ||
70 | - --libtool="$(top_builddir)/libtool" \ | ||
71 | + --libtool="$(LIBTOOL)" \ | ||
72 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
73 | --pkg-export gstreamer-fft-@GST_API_VERSION@ \ | ||
74 | --output $@ \ | ||
75 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | ||
76 | index 64d5eb0..91dc214 100644 | ||
77 | --- a/gst-libs/gst/pbutils/Makefile.am | ||
78 | +++ b/gst-libs/gst/pbutils/Makefile.am | ||
79 | @@ -94,7 +94,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | ||
80 | --include=GstTag-@GST_API_VERSION@ \ | ||
81 | --include=GstVideo-@GST_API_VERSION@ \ | ||
82 | --include=GstAudio-@GST_API_VERSION@ \ | ||
83 | - --libtool="$(top_builddir)/libtool" \ | ||
84 | + --libtool="$(LIBTOOL)" \ | ||
85 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
86 | --pkg gstreamer-tag-@GST_API_VERSION@ \ | ||
87 | --pkg gstreamer-video-@GST_API_VERSION@ \ | ||
88 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
89 | index 83d83cb..3bd8fc0 100644 | ||
90 | --- a/gst-libs/gst/riff/Makefile.am | ||
91 | +++ b/gst-libs/gst/riff/Makefile.am | ||
92 | @@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
93 | # --include=GstAudio-@GST_API_VERSION@ \ | ||
94 | # --include=GstTag-@GST_API_VERSION@ \ | ||
95 | # --include=Gst-@GST_API_VERSION@ \ | ||
96 | -# --libtool="$(top_builddir)/libtool" \ | ||
97 | +# --libtool="$(LIBTOOL)" \ | ||
98 | # --pkg gstreamer-@GST_API_VERSION@ \ | ||
99 | # --pkg gstreamer-tag-@GST_API_VERSION@ \ | ||
100 | # --pkg gstreamer-audio-@GST_API_VERSION@ \ | ||
101 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | ||
102 | index fdd01c1..f5445c1 100644 | ||
103 | --- a/gst-libs/gst/rtp/Makefile.am | ||
104 | +++ b/gst-libs/gst/rtp/Makefile.am | ||
105 | @@ -64,7 +64,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | ||
106 | --library=libgstrtp-@GST_API_VERSION@.la \ | ||
107 | --include=Gst-@GST_API_VERSION@ \ | ||
108 | --include=GstBase-@GST_API_VERSION@ \ | ||
109 | - --libtool="$(top_builddir)/libtool" \ | ||
110 | + --libtool="$(LIBTOOL)" \ | ||
111 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
112 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
113 | --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ | ||
114 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
115 | index ede5706..9b0b258 100644 | ||
116 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
117 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
118 | @@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
119 | --include=Gio-2.0 \ | ||
120 | --include=Gst-@GST_API_VERSION@ \ | ||
121 | --include=GstSdp-@GST_API_VERSION@ \ | ||
122 | - --libtool="$(top_builddir)/libtool" \ | ||
123 | + --libtool="$(LIBTOOL)" \ | ||
124 | --pkg gio-2.0 \ | ||
125 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
126 | --pkg gstreamer-sdp-@GST_API_VERSION@ \ | ||
127 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | ||
128 | index a90f30b..0e149b8 100644 | ||
129 | --- a/gst-libs/gst/sdp/Makefile.am | ||
130 | +++ b/gst-libs/gst/sdp/Makefile.am | ||
131 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | ||
132 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
133 | --library=libgstsdp-@GST_API_VERSION@.la \ | ||
134 | --include=Gst-@GST_API_VERSION@ \ | ||
135 | - --libtool="$(top_builddir)/libtool" \ | ||
136 | + --libtool="$(LIBTOOL)" \ | ||
137 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
138 | --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ | ||
139 | --output $@ \ | ||
140 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | ||
141 | index c534a4d..cafafd3 100644 | ||
142 | --- a/gst-libs/gst/tag/Makefile.am | ||
143 | +++ b/gst-libs/gst/tag/Makefile.am | ||
144 | @@ -44,7 +44,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | ||
145 | --library=libgsttag-@GST_API_VERSION@.la \ | ||
146 | --include=Gst-@GST_API_VERSION@ \ | ||
147 | --include=GstBase-@GST_API_VERSION@ \ | ||
148 | - --libtool="$(top_builddir)/libtool" \ | ||
149 | + --libtool="$(LIBTOOL)" \ | ||
150 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
151 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
152 | --pkg-export gstreamer-tag-@GST_API_VERSION@ \ | ||
153 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
154 | index 5d31fa1..ac64eb3 100644 | ||
155 | --- a/gst-libs/gst/video/Makefile.am | ||
156 | +++ b/gst-libs/gst/video/Makefile.am | ||
157 | @@ -113,7 +113,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | ||
158 | --library=libgstvideo-@GST_API_VERSION@.la \ | ||
159 | --include=Gst-@GST_API_VERSION@ \ | ||
160 | --include=GstBase-@GST_API_VERSION@ \ | ||
161 | - --libtool="$(top_builddir)/libtool" \ | ||
162 | + --libtool="$(LIBTOOL)" \ | ||
163 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
164 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
165 | --pkg-export gstreamer-video-@GST_API_VERSION@ \ | ||
166 | -- | ||
167 | 2.6.2 | ||
168 | |||
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 new file mode 100644 index 0000000000..85fcacb555 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | |||
@@ -0,0 +1,298 @@ | |||
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/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
149 | index 3bd8fc0..0a115cc 100644 | ||
150 | --- a/gst-libs/gst/riff/Makefile.am | ||
151 | +++ b/gst-libs/gst/riff/Makefile.am | ||
152 | @@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_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 | @@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_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 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | ||
175 | index f5445c1..527c0b4 100644 | ||
176 | --- a/gst-libs/gst/rtp/Makefile.am | ||
177 | +++ b/gst-libs/gst/rtp/Makefile.am | ||
178 | @@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | ||
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 | @@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
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 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
201 | index 9b0b258..4f6d9f8 100644 | ||
202 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
203 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
204 | @@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
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 | @@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
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 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | ||
223 | index 0e149b8..9aa0512 100644 | ||
224 | --- a/gst-libs/gst/sdp/Makefile.am | ||
225 | +++ b/gst-libs/gst/sdp/Makefile.am | ||
226 | @@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | ||
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 | @@ -52,7 +52,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
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 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | ||
245 | index cafafd3..ba99279 100644 | ||
246 | --- a/gst-libs/gst/tag/Makefile.am | ||
247 | +++ b/gst-libs/gst/tag/Makefile.am | ||
248 | @@ -39,8 +39,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | ||
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 | @@ -67,8 +67,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 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
271 | index ac64eb3..342c8c6 100644 | ||
272 | --- a/gst-libs/gst/video/Makefile.am | ||
273 | +++ b/gst-libs/gst/video/Makefile.am | ||
274 | @@ -108,8 +108,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | ||
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 | @@ -136,8 +136,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
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) | ||
296 | -- | ||
297 | 2.6.2 | ||
298 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch new file mode 100644 index 0000000000..9b66f7f49d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 26 Oct 2015 17:29:37 +0200 | ||
4 | Subject: [PATCH 3/4] riff: add missing include directories when calling | ||
5 | introspection scanner | ||
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/riff/Makefile.am | 2 ++ | ||
11 | 1 file changed, 2 insertions(+) | ||
12 | |||
13 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
14 | index 0a115cc..5057a58 100644 | ||
15 | --- a/gst-libs/gst/riff/Makefile.am | ||
16 | +++ b/gst-libs/gst/riff/Makefile.am | ||
17 | @@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
18 | # --strip-prefix=Gst \ | ||
19 | # --warn-all \ | ||
20 | # --c-include "gst/riff/riff.h" \ | ||
21 | +# -I$(top_srcdir)/gst-libs \ | ||
22 | +# -I$(top_builddir)/gst-libs \ | ||
23 | # --add-include-path=$(builddir)/../tag \ | ||
24 | # --add-include-path=$(builddir)/../audio \ | ||
25 | # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
26 | -- | ||
27 | 2.6.2 | ||
28 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch new file mode 100644 index 0000000000..42d99c1db9 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 26 Oct 2015 17:30:14 +0200 | ||
4 | Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in | ||
5 | Makefile.am | ||
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/rtsp/Makefile.am | 1 - | ||
11 | 1 file changed, 1 deletion(-) | ||
12 | |||
13 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
14 | index 4f6d9f8..0afa370 100644 | ||
15 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
16 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
17 | @@ -74,7 +74,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
18 | --libtool="$(LIBTOOL)" \ | ||
19 | --pkg gio-2.0 \ | ||
20 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
21 | - --pkg gstreamer-sdp-@GST_API_VERSION@ \ | ||
22 | --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ | ||
23 | --add-init-section="$(INTROSPECTION_INIT)" \ | ||
24 | --output $@ \ | ||
25 | -- | ||
26 | 2.6.2 | ||
27 | |||