diff options
author | Yuqing Zhu <carol.zhu@nxp.com> | 2018-08-06 17:23:31 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-09-07 17:24:35 -0300 |
commit | 13bdb940a49f3ac9c32d909368f84bcdae71d341 (patch) | |
tree | 62246245822d76351ebf451226c380419d2e0362 /recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx | |
parent | 680d8e12c8a3a3e9dfdd33e00fca0328c890eac9 (diff) | |
download | meta-freescale-13bdb940a49f3ac9c32d909368f84bcdae71d341.tar.gz |
gstreamer1.0-plugins-base: Upgrade to v1.14.imx
Add GST_GL_API ahead api to export symbol
add include "gstglfuncs.h" when need call gl api.
Add ion dmabuf support in glupload/gldownload.
Add fullRange to hdr10 metadata.
Move gstimxcommon.h into base for imx specified dev.
Add imx physical memory allocator.
Fix glplugin not build in wayland backend.
Patch update to fix applying conflicts.
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx')
5 files changed, 560 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch new file mode 100644 index 000000000..a1cc7d3dc --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | |||
@@ -0,0 +1,171 @@ | |||
1 | From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yuqing Zhu <carol.zhu@nxp.com> | ||
3 | Date: Fri, 20 Apr 2018 22:46:46 +0800 | ||
4 | Subject: [PATCH] Makefile.am: don't hardcode libtool name when running | ||
5 | introspection tools | ||
6 | |||
7 | Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0 | ||
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 | 2 +- | ||
14 | gst-libs/gst/app/Makefile.am | 2 +- | ||
15 | gst-libs/gst/audio/Makefile.am | 2 +- | ||
16 | gst-libs/gst/gl/Makefile.am | 2 +- | ||
17 | gst-libs/gst/pbutils/Makefile.am | 2 +- | ||
18 | gst-libs/gst/riff/Makefile.am | 2 +- | ||
19 | gst-libs/gst/rtp/Makefile.am | 2 +- | ||
20 | gst-libs/gst/rtsp/Makefile.am | 2 +- | ||
21 | gst-libs/gst/sdp/Makefile.am | 2 +- | ||
22 | gst-libs/gst/tag/Makefile.am | 2 +- | ||
23 | gst-libs/gst/video/Makefile.am | 2 +- | ||
24 | 11 files changed, 11 insertions(+), 11 deletions(-) | ||
25 | |||
26 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | ||
27 | index 0edc0ae..d0d425d 100644 | ||
28 | --- a/gst-libs/gst/allocators/Makefile.am | ||
29 | +++ b/gst-libs/gst/allocators/Makefile.am | ||
30 | @@ -58,7 +58,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | ||
31 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
32 | --library=libgstallocators-@GST_API_VERSION@.la \ | ||
33 | --include=Gst-@GST_API_VERSION@ \ | ||
34 | - --libtool="$(top_builddir)/libtool" \ | ||
35 | + --libtool="$(LIBTOOL)" \ | ||
36 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
37 | --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ | ||
38 | --output $@ \ | ||
39 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | ||
40 | index 52f6ad3..5bfd606 100644 | ||
41 | --- a/gst-libs/gst/app/Makefile.am | ||
42 | +++ b/gst-libs/gst/app/Makefile.am | ||
43 | @@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | ||
44 | --library=libgstapp-@GST_API_VERSION@.la \ | ||
45 | --include=Gst-@GST_API_VERSION@ \ | ||
46 | --include=GstBase-@GST_API_VERSION@ \ | ||
47 | - --libtool="$(top_builddir)/libtool" \ | ||
48 | + --libtool="$(LIBTOOL)" \ | ||
49 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
50 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
51 | --pkg-export gstreamer-app-@GST_API_VERSION@ \ | ||
52 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | ||
53 | index 2922245..7fb65f2 100644 | ||
54 | --- a/gst-libs/gst/audio/Makefile.am | ||
55 | +++ b/gst-libs/gst/audio/Makefile.am | ||
56 | @@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | ||
57 | --include=Gst-@GST_API_VERSION@ \ | ||
58 | --include=GstBase-@GST_API_VERSION@ \ | ||
59 | --include=GstTag-@GST_API_VERSION@ \ | ||
60 | - --libtool="$(top_builddir)/libtool" \ | ||
61 | + --libtool="$(LIBTOOL)" \ | ||
62 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
63 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
64 | --pkg-export gstreamer-audio-@GST_API_VERSION@ \ | ||
65 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | ||
66 | index b04187f..576bf1c 100644 | ||
67 | --- a/gst-libs/gst/gl/Makefile.am | ||
68 | +++ b/gst-libs/gst/gl/Makefile.am | ||
69 | @@ -205,7 +205,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ | ||
70 | --include=Gst-@GST_API_VERSION@ \ | ||
71 | --include=GstBase-@GST_API_VERSION@ \ | ||
72 | --include=GstVideo-@GST_API_VERSION@ \ | ||
73 | - --libtool="$(top_builddir)/libtool" \ | ||
74 | + --libtool="$(LIBTOOL)" \ | ||
75 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
76 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
77 | --pkg gstreamer-video-@GST_API_VERSION@ \ | ||
78 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | ||
79 | index ae51993..35a6e44 100644 | ||
80 | --- a/gst-libs/gst/pbutils/Makefile.am | ||
81 | +++ b/gst-libs/gst/pbutils/Makefile.am | ||
82 | @@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | ||
83 | --include=GstTag-@GST_API_VERSION@ \ | ||
84 | --include=GstVideo-@GST_API_VERSION@ \ | ||
85 | --include=GstAudio-@GST_API_VERSION@ \ | ||
86 | - --libtool="$(top_builddir)/libtool" \ | ||
87 | + --libtool="$(LIBTOOL)" \ | ||
88 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
89 | --pkg gstreamer-tag-@GST_API_VERSION@ \ | ||
90 | --pkg gstreamer-video-@GST_API_VERSION@ \ | ||
91 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
92 | index fb53f06..e66ef4f 100644 | ||
93 | --- a/gst-libs/gst/riff/Makefile.am | ||
94 | +++ b/gst-libs/gst/riff/Makefile.am | ||
95 | @@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
96 | # --include=GstAudio-@GST_API_VERSION@ \ | ||
97 | # --include=GstTag-@GST_API_VERSION@ \ | ||
98 | # --include=Gst-@GST_API_VERSION@ \ | ||
99 | -# --libtool="$(top_builddir)/libtool" \ | ||
100 | +# --libtool="$(LIBTOOL)" \ | ||
101 | # --pkg gstreamer-@GST_API_VERSION@ \ | ||
102 | # --pkg gstreamer-tag-@GST_API_VERSION@ \ | ||
103 | # --pkg gstreamer-audio-@GST_API_VERSION@ \ | ||
104 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | ||
105 | index a6f971d..77ebeeb 100644 | ||
106 | --- a/gst-libs/gst/rtp/Makefile.am | ||
107 | +++ b/gst-libs/gst/rtp/Makefile.am | ||
108 | @@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | ||
109 | --library=libgstrtp-@GST_API_VERSION@.la \ | ||
110 | --include=Gst-@GST_API_VERSION@ \ | ||
111 | --include=GstBase-@GST_API_VERSION@ \ | ||
112 | - --libtool="$(top_builddir)/libtool" \ | ||
113 | + --libtool="$(LIBTOOL)" \ | ||
114 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
115 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
116 | --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ | ||
117 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
118 | index ceb07f4..db9d0fd 100644 | ||
119 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
120 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
121 | @@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
122 | --include=Gio-2.0 \ | ||
123 | --include=Gst-@GST_API_VERSION@ \ | ||
124 | --include=GstSdp-@GST_API_VERSION@ \ | ||
125 | - --libtool="$(top_builddir)/libtool" \ | ||
126 | + --libtool="$(LIBTOOL)" \ | ||
127 | --pkg gio-2.0 \ | ||
128 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
129 | --pkg gstreamer-sdp-@GST_API_VERSION@ \ | ||
130 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | ||
131 | index e197e9b..6e05cc7 100644 | ||
132 | --- a/gst-libs/gst/sdp/Makefile.am | ||
133 | +++ b/gst-libs/gst/sdp/Makefile.am | ||
134 | @@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | ||
135 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
136 | --library=libgstsdp-@GST_API_VERSION@.la \ | ||
137 | --include=Gst-@GST_API_VERSION@ \ | ||
138 | - --libtool="$(top_builddir)/libtool" \ | ||
139 | + --libtool="$(LIBTOOL)" \ | ||
140 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
141 | --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ | ||
142 | --output $@ \ | ||
143 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | ||
144 | index 0247c33..c86515b 100644 | ||
145 | --- a/gst-libs/gst/tag/Makefile.am | ||
146 | +++ b/gst-libs/gst/tag/Makefile.am | ||
147 | @@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | ||
148 | --library=libgsttag-@GST_API_VERSION@.la \ | ||
149 | --include=Gst-@GST_API_VERSION@ \ | ||
150 | --include=GstBase-@GST_API_VERSION@ \ | ||
151 | - --libtool="$(top_builddir)/libtool" \ | ||
152 | + --libtool="$(LIBTOOL)" \ | ||
153 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
154 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
155 | --pkg-export gstreamer-tag-@GST_API_VERSION@ \ | ||
156 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
157 | index 1b74f37..0f7c07e 100644 | ||
158 | --- a/gst-libs/gst/video/Makefile.am | ||
159 | +++ b/gst-libs/gst/video/Makefile.am | ||
160 | @@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | ||
161 | --library=libgstvideo-@GST_API_VERSION@.la \ | ||
162 | --include=Gst-@GST_API_VERSION@ \ | ||
163 | --include=GstBase-@GST_API_VERSION@ \ | ||
164 | - --libtool="$(top_builddir)/libtool" \ | ||
165 | + --libtool="$(LIBTOOL)" \ | ||
166 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
167 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
168 | --pkg-export gstreamer-video-@GST_API_VERSION@ \ | ||
169 | -- | ||
170 | 2.7.4 | ||
171 | |||
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 000000000..4b6cfdd69 --- /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 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch new file mode 100644 index 000000000..9b66f7f49 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/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/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch new file mode 100644 index 000000000..4adf60546 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/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 | @@ -75,7 +75,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 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch new file mode 100644 index 000000000..23950b67f --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Wed, 20 Jan 2016 13:00:00 -0800 | ||
4 | Subject: [PATCH] make gio_unix_2_0 dependency configurable | ||
5 | |||
6 | Prior to 1.7.1, gst-plugins-base accepted a configure option to | ||
7 | disable gio_unix_2_0, however it was implemented incorrectly using | ||
8 | AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the | ||
9 | dependency unconditional. | ||
10 | |||
11 | http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70 | ||
12 | |||
13 | To make builds deterministic, re-instate support for | ||
14 | --disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE | ||
15 | instead of AG_GST_CHECK_FEATURE. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
20 | |||
21 | --- | ||
22 | configure.ac | 7 +++++++ | ||
23 | 1 file changed, 7 insertions(+) | ||
24 | |||
25 | diff --git a/configure.ac b/configure.ac | ||
26 | index 12807bc..35a0bf3 100644 | ||
27 | --- a/configure.ac | ||
28 | +++ b/configure.ac | ||
29 | @@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") | ||
30 | AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") | ||
31 | |||
32 | dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** | ||
33 | +AC_ARG_ENABLE([gio_unix_2_0], | ||
34 | + [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])], | ||
35 | + [], | ||
36 | + [enable_gio_unix_2_0=yes]) | ||
37 | + | ||
38 | +if test "x${enable_gio_unix_2_0}" != "xno"; then | ||
39 | PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24, | ||
40 | HAVE_GIO_UNIX_2_0="yes", | ||
41 | HAVE_GIO_UNIX_2_0="no") | ||
42 | +fi | ||
43 | AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") | ||
44 | |||
45 | dnl *** finalize CFLAGS, LDFLAGS, LIBS | ||