summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch)75
-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 (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch)172
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch)0
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch45
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb)10
6 files changed, 175 insertions, 127 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
index 094bdac8..a1cc7d3d 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
@@ -1,16 +1,19 @@
1From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 1From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Yuqing Zhu <carol.zhu@nxp.com>
3Date: Fri, 20 Nov 2015 16:53:04 +0200 3Date: Fri, 20 Apr 2018 22:46:46 +0800
4Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running 4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools 5 introspection tools
6 6
7Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0
8
7Upstream-Status: Pending [review on oe-core maillist] 9Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10
11Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
9--- 12---
10 gst-libs/gst/allocators/Makefile.am | 2 +- 13 gst-libs/gst/allocators/Makefile.am | 2 +-
11 gst-libs/gst/app/Makefile.am | 2 +- 14 gst-libs/gst/app/Makefile.am | 2 +-
12 gst-libs/gst/audio/Makefile.am | 2 +- 15 gst-libs/gst/audio/Makefile.am | 2 +-
13 gst-libs/gst/fft/Makefile.am | 2 +- 16 gst-libs/gst/gl/Makefile.am | 2 +-
14 gst-libs/gst/pbutils/Makefile.am | 2 +- 17 gst-libs/gst/pbutils/Makefile.am | 2 +-
15 gst-libs/gst/riff/Makefile.am | 2 +- 18 gst-libs/gst/riff/Makefile.am | 2 +-
16 gst-libs/gst/rtp/Makefile.am | 2 +- 19 gst-libs/gst/rtp/Makefile.am | 2 +-
@@ -21,10 +24,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
21 11 files changed, 11 insertions(+), 11 deletions(-) 24 11 files changed, 11 insertions(+), 11 deletions(-)
22 25
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am 26diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24index 9361bf9..bc7f53a 100644 27index 0edc0ae..d0d425d 100644
25--- a/gst-libs/gst/allocators/Makefile.am 28--- a/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am 29+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ 30@@ -58,7 +58,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@` \ 31 --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 \ 32 --library=libgstallocators-@GST_API_VERSION@.la \
30 --include=Gst-@GST_API_VERSION@ \ 33 --include=Gst-@GST_API_VERSION@ \
@@ -34,10 +37,10 @@ index 9361bf9..bc7f53a 100644
34 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ 37 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \
35 --output $@ \ 38 --output $@ \
36diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am 39diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
37index 6d6de8d..dcc2fe0 100644 40index 52f6ad3..5bfd606 100644
38--- a/gst-libs/gst/app/Makefile.am 41--- a/gst-libs/gst/app/Makefile.am
39+++ b/gst-libs/gst/app/Makefile.am 42+++ b/gst-libs/gst/app/Makefile.am
40@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO 43@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
41 --library=libgstapp-@GST_API_VERSION@.la \ 44 --library=libgstapp-@GST_API_VERSION@.la \
42 --include=Gst-@GST_API_VERSION@ \ 45 --include=Gst-@GST_API_VERSION@ \
43 --include=GstBase-@GST_API_VERSION@ \ 46 --include=GstBase-@GST_API_VERSION@ \
@@ -47,10 +50,10 @@ index 6d6de8d..dcc2fe0 100644
47 --pkg gstreamer-base-@GST_API_VERSION@ \ 50 --pkg gstreamer-base-@GST_API_VERSION@ \
48 --pkg-export gstreamer-app-@GST_API_VERSION@ \ 51 --pkg-export gstreamer-app-@GST_API_VERSION@ \
49diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am 52diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
50index 275d222..2374196 100644 53index 2922245..7fb65f2 100644
51--- a/gst-libs/gst/audio/Makefile.am 54--- a/gst-libs/gst/audio/Makefile.am
52+++ b/gst-libs/gst/audio/Makefile.am 55+++ b/gst-libs/gst/audio/Makefile.am
53@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE 56@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
54 --include=Gst-@GST_API_VERSION@ \ 57 --include=Gst-@GST_API_VERSION@ \
55 --include=GstBase-@GST_API_VERSION@ \ 58 --include=GstBase-@GST_API_VERSION@ \
56 --include=GstTag-@GST_API_VERSION@ \ 59 --include=GstTag-@GST_API_VERSION@ \
@@ -59,24 +62,24 @@ index 275d222..2374196 100644
59 --pkg gstreamer-@GST_API_VERSION@ \ 62 --pkg gstreamer-@GST_API_VERSION@ \
60 --pkg gstreamer-base-@GST_API_VERSION@ \ 63 --pkg gstreamer-base-@GST_API_VERSION@ \
61 --pkg-export gstreamer-audio-@GST_API_VERSION@ \ 64 --pkg-export gstreamer-audio-@GST_API_VERSION@ \
62diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am 65diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
63index 09b3d68..f545354 100644 66index b04187f..576bf1c 100644
64--- a/gst-libs/gst/fft/Makefile.am 67--- a/gst-libs/gst/gl/Makefile.am
65+++ b/gst-libs/gst/fft/Makefile.am 68+++ b/gst-libs/gst/gl/Makefile.am
66@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO 69@@ -205,7 +205,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
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 --include=Gst-@GST_API_VERSION@ \
71 --include=GstBase-@GST_API_VERSION@ \
72 --include=GstVideo-@GST_API_VERSION@ \
70- --libtool="$(top_builddir)/libtool" \ 73- --libtool="$(top_builddir)/libtool" \
71+ --libtool="$(LIBTOOL)" \ 74+ --libtool="$(LIBTOOL)" \
72 --pkg gstreamer-@GST_API_VERSION@ \ 75 --pkg gstreamer-@GST_API_VERSION@ \
73 --pkg-export gstreamer-fft-@GST_API_VERSION@ \ 76 --pkg gstreamer-base-@GST_API_VERSION@ \
74 --output $@ \ 77 --pkg gstreamer-video-@GST_API_VERSION@ \
75diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am 78diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
76index 64d5eb0..91dc214 100644 79index ae51993..35a6e44 100644
77--- a/gst-libs/gst/pbutils/Makefile.am 80--- a/gst-libs/gst/pbutils/Makefile.am
78+++ b/gst-libs/gst/pbutils/Makefile.am 81+++ b/gst-libs/gst/pbutils/Makefile.am
79@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP 82@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
80 --include=GstTag-@GST_API_VERSION@ \ 83 --include=GstTag-@GST_API_VERSION@ \
81 --include=GstVideo-@GST_API_VERSION@ \ 84 --include=GstVideo-@GST_API_VERSION@ \
82 --include=GstAudio-@GST_API_VERSION@ \ 85 --include=GstAudio-@GST_API_VERSION@ \
@@ -86,10 +89,10 @@ index 64d5eb0..91dc214 100644
86 --pkg gstreamer-tag-@GST_API_VERSION@ \ 89 --pkg gstreamer-tag-@GST_API_VERSION@ \
87 --pkg gstreamer-video-@GST_API_VERSION@ \ 90 --pkg gstreamer-video-@GST_API_VERSION@ \
88diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am 91diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
89index 83d83cb..3bd8fc0 100644 92index fb53f06..e66ef4f 100644
90--- a/gst-libs/gst/riff/Makefile.am 93--- a/gst-libs/gst/riff/Makefile.am
91+++ b/gst-libs/gst/riff/Makefile.am 94+++ b/gst-libs/gst/riff/Makefile.am
92@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) 95@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
93 # --include=GstAudio-@GST_API_VERSION@ \ 96 # --include=GstAudio-@GST_API_VERSION@ \
94 # --include=GstTag-@GST_API_VERSION@ \ 97 # --include=GstTag-@GST_API_VERSION@ \
95 # --include=Gst-@GST_API_VERSION@ \ 98 # --include=Gst-@GST_API_VERSION@ \
@@ -99,10 +102,10 @@ index 83d83cb..3bd8fc0 100644
99 # --pkg gstreamer-tag-@GST_API_VERSION@ \ 102 # --pkg gstreamer-tag-@GST_API_VERSION@ \
100 # --pkg gstreamer-audio-@GST_API_VERSION@ \ 103 # --pkg gstreamer-audio-@GST_API_VERSION@ \
101diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am 104diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
102index fdd01c1..f5445c1 100644 105index a6f971d..77ebeeb 100644
103--- a/gst-libs/gst/rtp/Makefile.am 106--- a/gst-libs/gst/rtp/Makefile.am
104+++ b/gst-libs/gst/rtp/Makefile.am 107+++ b/gst-libs/gst/rtp/Makefile.am
105@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO 108@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
106 --library=libgstrtp-@GST_API_VERSION@.la \ 109 --library=libgstrtp-@GST_API_VERSION@.la \
107 --include=Gst-@GST_API_VERSION@ \ 110 --include=Gst-@GST_API_VERSION@ \
108 --include=GstBase-@GST_API_VERSION@ \ 111 --include=GstBase-@GST_API_VERSION@ \
@@ -112,10 +115,10 @@ index fdd01c1..f5445c1 100644
112 --pkg gstreamer-base-@GST_API_VERSION@ \ 115 --pkg gstreamer-base-@GST_API_VERSION@ \
113 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ 116 --pkg-export gstreamer-rtp-@GST_API_VERSION@ \
114diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am 117diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
115index ede5706..9b0b258 100644 118index ceb07f4..db9d0fd 100644
116--- a/gst-libs/gst/rtsp/Makefile.am 119--- a/gst-libs/gst/rtsp/Makefile.am
117+++ b/gst-libs/gst/rtsp/Makefile.am 120+++ b/gst-libs/gst/rtsp/Makefile.am
118@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 121@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
119 --include=Gio-2.0 \ 122 --include=Gio-2.0 \
120 --include=Gst-@GST_API_VERSION@ \ 123 --include=Gst-@GST_API_VERSION@ \
121 --include=GstSdp-@GST_API_VERSION@ \ 124 --include=GstSdp-@GST_API_VERSION@ \
@@ -125,10 +128,10 @@ index ede5706..9b0b258 100644
125 --pkg gstreamer-@GST_API_VERSION@ \ 128 --pkg gstreamer-@GST_API_VERSION@ \
126 --pkg gstreamer-sdp-@GST_API_VERSION@ \ 129 --pkg gstreamer-sdp-@GST_API_VERSION@ \
127diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am 130diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
128index a90f30b..0e149b8 100644 131index e197e9b..6e05cc7 100644
129--- a/gst-libs/gst/sdp/Makefile.am 132--- a/gst-libs/gst/sdp/Makefile.am
130+++ b/gst-libs/gst/sdp/Makefile.am 133+++ b/gst-libs/gst/sdp/Makefile.am
131@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO 134@@ -34,7 +34,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@` \ 135 --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 \ 136 --library=libgstsdp-@GST_API_VERSION@.la \
134 --include=Gst-@GST_API_VERSION@ \ 137 --include=Gst-@GST_API_VERSION@ \
@@ -138,10 +141,10 @@ index a90f30b..0e149b8 100644
138 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ 141 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \
139 --output $@ \ 142 --output $@ \
140diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am 143diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
141index c534a4d..cafafd3 100644 144index 0247c33..c86515b 100644
142--- a/gst-libs/gst/tag/Makefile.am 145--- a/gst-libs/gst/tag/Makefile.am
143+++ b/gst-libs/gst/tag/Makefile.am 146+++ b/gst-libs/gst/tag/Makefile.am
144@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO 147@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
145 --library=libgsttag-@GST_API_VERSION@.la \ 148 --library=libgsttag-@GST_API_VERSION@.la \
146 --include=Gst-@GST_API_VERSION@ \ 149 --include=Gst-@GST_API_VERSION@ \
147 --include=GstBase-@GST_API_VERSION@ \ 150 --include=GstBase-@GST_API_VERSION@ \
@@ -151,10 +154,10 @@ index c534a4d..cafafd3 100644
151 --pkg gstreamer-base-@GST_API_VERSION@ \ 154 --pkg gstreamer-base-@GST_API_VERSION@ \
152 --pkg-export gstreamer-tag-@GST_API_VERSION@ \ 155 --pkg-export gstreamer-tag-@GST_API_VERSION@ \
153diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am 156diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
154index 5d31fa1..ac64eb3 100644 157index 1b74f37..0f7c07e 100644
155--- a/gst-libs/gst/video/Makefile.am 158--- a/gst-libs/gst/video/Makefile.am
156+++ b/gst-libs/gst/video/Makefile.am 159+++ b/gst-libs/gst/video/Makefile.am
157@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE 160@@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
158 --library=libgstvideo-@GST_API_VERSION@.la \ 161 --library=libgstvideo-@GST_API_VERSION@.la \
159 --include=Gst-@GST_API_VERSION@ \ 162 --include=Gst-@GST_API_VERSION@ \
160 --include=GstBase-@GST_API_VERSION@ \ 163 --include=GstBase-@GST_API_VERSION@ \
@@ -164,5 +167,5 @@ index 5d31fa1..ac64eb3 100644
164 --pkg gstreamer-base-@GST_API_VERSION@ \ 167 --pkg gstreamer-base-@GST_API_VERSION@ \
165 --pkg-export gstreamer-video-@GST_API_VERSION@ \ 168 --pkg-export gstreamer-video-@GST_API_VERSION@ \
166-- 169--
1672.6.2 1702.7.4
168 171
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 6616e2cf..4b6cfdd6 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -1,16 +1,18 @@
1From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 1From e3f28d15e38f7633d8ed4023fe883b8377c0597e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Yuqing Zhu <carol.zhu@nxp.com>
3Date: Mon, 26 Oct 2015 16:38:18 +0200 3Date: Fri, 20 Apr 2018 02:03:57 +0800
4Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with 4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
5 PKG_CONFIG_SYSROOT_DIR 5 PKG_CONFIG_SYSROOT_DIR
6 6
7Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7
8
7Upstream-Status: Pending [review on oe-core maillist] 9Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10
11Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
9--- 12---
10 gst-libs/gst/allocators/Makefile.am | 4 ++-- 13 gst-libs/gst/allocators/Makefile.am | 4 ++--
11 gst-libs/gst/app/Makefile.am | 4 ++-- 14 gst-libs/gst/app/Makefile.am | 8 ++++----
12 gst-libs/gst/audio/Makefile.am | 12 ++++++------ 15 gst-libs/gst/audio/Makefile.am | 12 ++++++------
13 gst-libs/gst/fft/Makefile.am | 4 ++--
14 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ 16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
15 gst-libs/gst/riff/Makefile.am | 8 ++++---- 17 gst-libs/gst/riff/Makefile.am | 8 ++++----
16 gst-libs/gst/rtp/Makefile.am | 8 ++++---- 18 gst-libs/gst/rtp/Makefile.am | 8 ++++----
@@ -18,13 +20,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18 gst-libs/gst/sdp/Makefile.am | 4 ++-- 20 gst-libs/gst/sdp/Makefile.am | 4 ++--
19 gst-libs/gst/tag/Makefile.am | 8 ++++---- 21 gst-libs/gst/tag/Makefile.am | 8 ++++----
20 gst-libs/gst/video/Makefile.am | 8 ++++---- 22 gst-libs/gst/video/Makefile.am | 8 ++++----
21 11 files changed, 38 insertions(+), 38 deletions(-) 23 10 files changed, 38 insertions(+), 38 deletions(-)
22 24
23Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24=================================================================== 26index c4412a1..9f9d14d 100644
25--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am 27--- a/gst-libs/gst/allocators/Makefile.am
26+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 28+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I 29@@ -59,7 +59,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
28 --c-include "gst/allocators/allocators.h" \ 30 --c-include "gst/allocators/allocators.h" \
29 -I$(top_srcdir)/gst-libs \ 31 -I$(top_srcdir)/gst-libs \
30 -I$(top_builddir)/gst-libs \ 32 -I$(top_builddir)/gst-libs \
@@ -33,7 +35,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
33 --library=libgstallocators-@GST_API_VERSION@.la \ 35 --library=libgstallocators-@GST_API_VERSION@.la \
34 --include=Gst-@GST_API_VERSION@ \ 36 --include=Gst-@GST_API_VERSION@ \
35 --libtool="$(LIBTOOL)" \ 37 --libtool="$(LIBTOOL)" \
36@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 38@@ -83,7 +83,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
37 $(INTROSPECTION_COMPILER) \ 39 $(INTROSPECTION_COMPILER) \
38 --includedir=$(srcdir) \ 40 --includedir=$(srcdir) \
39 --includedir=$(builddir) \ 41 --includedir=$(builddir) \
@@ -42,11 +44,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 44 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
43 45
44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 46 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
45Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 47diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
46=================================================================== 48index 5bfd606..c231267 100644
47--- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am 49--- a/gst-libs/gst/app/Makefile.am
48+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 50+++ b/gst-libs/gst/app/Makefile.am
49@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE 51@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
50 --c-include "gst/app/app.h" \ 52 --c-include "gst/app/app.h" \
51 -I$(top_srcdir)/gst-libs \ 53 -I$(top_srcdir)/gst-libs \
52 -I$(top_builddir)/gst-libs \ 54 -I$(top_builddir)/gst-libs \
@@ -57,11 +59,22 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am
57 --library=libgstapp-@GST_API_VERSION@.la \ 59 --library=libgstapp-@GST_API_VERSION@.la \
58 --include=Gst-@GST_API_VERSION@ \ 60 --include=Gst-@GST_API_VERSION@ \
59 --include=GstBase-@GST_API_VERSION@ \ 61 --include=GstBase-@GST_API_VERSION@ \
60Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 62@@ -79,8 +79,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
61=================================================================== 63 $(INTROSPECTION_COMPILER) \
62--- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am 64 --includedir=$(srcdir) \
63+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 65 --includedir=$(builddir) \
64@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS 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)
73diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
74index 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
65 -I$(top_srcdir)/gst-libs \ 78 -I$(top_srcdir)/gst-libs \
66 -I$(top_builddir)/gst-libs \ 79 -I$(top_builddir)/gst-libs \
67 --c-include "gst/audio/audio.h" \ 80 --c-include "gst/audio/audio.h" \
@@ -78,7 +91,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 91 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
79 --include=Gst-@GST_API_VERSION@ \ 92 --include=Gst-@GST_API_VERSION@ \
80 --include=GstBase-@GST_API_VERSION@ \ 93 --include=GstBase-@GST_API_VERSION@ \
81@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 94@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
82 --includedir=$(srcdir) \ 95 --includedir=$(srcdir) \
83 --includedir=$(builddir) \ 96 --includedir=$(builddir) \
84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 97 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -89,33 +102,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 102 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
90 103
91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 104 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
92Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 105diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
93=================================================================== 106index 35a6e44..49d6894 100644
94--- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am 107--- a/gst-libs/gst/pbutils/Makefile.am
95+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 108+++ b/gst-libs/gst/pbutils/Makefile.am
96@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE 109@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
97 --c-include "gst/fft/fft.h" \
98 -I$(top_srcdir)/gst-libs \
99 -I$(top_builddir)/gst-libs \
100- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
101+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
102 --library=libgstfft-@GST_API_VERSION@.la \
103 --include=Gst-@GST_API_VERSION@ \
104 --libtool="$(LIBTOOL)" \
105@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
106 $(INTROSPECTION_COMPILER) \
107 --includedir=$(srcdir) \
108 --includedir=$(builddir) \
109- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
110+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
112
113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
114Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
115===================================================================
116--- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am
117+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
118@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR
119 --c-include "gst/pbutils/pbutils.h" \ 110 --c-include "gst/pbutils/pbutils.h" \
120 -I$(top_srcdir)/gst-libs \ 111 -I$(top_srcdir)/gst-libs \
121 -I$(top_builddir)/gst-libs \ 112 -I$(top_builddir)/gst-libs \
@@ -134,7 +125,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 125 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
135 --library-path="$(top_builddir)/gst-libs/gst/video/" \ 126 --library-path="$(top_builddir)/gst-libs/gst/video/" \
136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \ 127 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
137@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 128@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
138 $(INTROSPECTION_COMPILER) \ 129 $(INTROSPECTION_COMPILER) \
139 --includedir=$(srcdir) \ 130 --includedir=$(srcdir) \
140 --includedir=$(builddir) \ 131 --includedir=$(builddir) \
@@ -145,11 +136,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 136 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
146 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 137 --includedir="$(top_builddir)/gst-libs/gst/video/" \
147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \ 138 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
148Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 139diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
149=================================================================== 140index e66ef4f..c8c588a 100644
150--- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am 141--- a/gst-libs/gst/riff/Makefile.am
151+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 142+++ b/gst-libs/gst/riff/Makefile.am
152@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 143@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
153 # --c-include "gst/riff/riff.h" \ 144 # --c-include "gst/riff/riff.h" \
154 # --add-include-path=$(builddir)/../tag \ 145 # --add-include-path=$(builddir)/../tag \
155 # --add-include-path=$(builddir)/../audio \ 146 # --add-include-path=$(builddir)/../audio \
@@ -160,7 +151,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
160 # --library=libgstriff-@GST_API_VERSION@.la \ 151 # --library=libgstriff-@GST_API_VERSION@.la \
161 # --include=GstAudio-@GST_API_VERSION@ \ 152 # --include=GstAudio-@GST_API_VERSION@ \
162 # --include=GstTag-@GST_API_VERSION@ \ 153 # --include=GstTag-@GST_API_VERSION@ \
163@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 154@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
164 # --includedir=$(builddir) \ 155 # --includedir=$(builddir) \
165 # --includedir=$(builddir)/../tag \ 156 # --includedir=$(builddir)/../tag \
166 # --includedir=$(builddir)/../audio \ 157 # --includedir=$(builddir)/../audio \
@@ -171,11 +162,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 162 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
172 # 163 #
173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 164 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
174Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 165diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
175=================================================================== 166index 77ebeeb..9aee788 100644
176--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am 167--- a/gst-libs/gst/rtp/Makefile.am
177+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 168+++ b/gst-libs/gst/rtp/Makefile.am
178@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE 169@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
179 --c-include "gst/rtp/rtp.h" \ 170 --c-include "gst/rtp/rtp.h" \
180 -I$(top_builddir)/gst-libs \ 171 -I$(top_builddir)/gst-libs \
181 -I$(top_srcdir)/gst-libs \ 172 -I$(top_srcdir)/gst-libs \
@@ -186,7 +177,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
186 --library=libgstrtp-@GST_API_VERSION@.la \ 177 --library=libgstrtp-@GST_API_VERSION@.la \
187 --include=Gst-@GST_API_VERSION@ \ 178 --include=Gst-@GST_API_VERSION@ \
188 --include=GstBase-@GST_API_VERSION@ \ 179 --include=GstBase-@GST_API_VERSION@ \
189@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 180@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
190 $(INTROSPECTION_COMPILER) \ 181 $(INTROSPECTION_COMPILER) \
191 --includedir=$(srcdir) \ 182 --includedir=$(srcdir) \
192 --includedir=$(builddir) \ 183 --includedir=$(builddir) \
@@ -197,11 +188,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 188 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
198 189
199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 190 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
200Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 191diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
201=================================================================== 192index db9d0fd..79027cb 100644
202--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am 193--- a/gst-libs/gst/rtsp/Makefile.am
203+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 194+++ b/gst-libs/gst/rtsp/Makefile.am
204@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP 195@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
205 -I$(top_builddir)/gst-libs \ 196 -I$(top_builddir)/gst-libs \
206 -I$(top_srcdir)/gst-libs \ 197 -I$(top_srcdir)/gst-libs \
207 --add-include-path=$(builddir)/../sdp \ 198 --add-include-path=$(builddir)/../sdp \
@@ -210,7 +201,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
210 --library=libgstrtsp-@GST_API_VERSION@.la \ 201 --library=libgstrtsp-@GST_API_VERSION@.la \
211 --include=Gio-2.0 \ 202 --include=Gio-2.0 \
212 --include=Gst-@GST_API_VERSION@ \ 203 --include=Gst-@GST_API_VERSION@ \
213@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 204@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
214 --includedir=$(srcdir) \ 205 --includedir=$(srcdir) \
215 --includedir=$(builddir) \ 206 --includedir=$(builddir) \
216 --includedir=$(builddir)/../sdp \ 207 --includedir=$(builddir)/../sdp \
@@ -219,11 +210,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 210 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
220 211
221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 212 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
222Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 213diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
223=================================================================== 214index 6e05cc7..c7cf514 100644
224--- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am 215--- a/gst-libs/gst/sdp/Makefile.am
225+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 216+++ b/gst-libs/gst/sdp/Makefile.am
226@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE 217@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
227 --warn-all \ 218 --warn-all \
228 --c-include "gst/sdp/sdp.h" \ 219 --c-include "gst/sdp/sdp.h" \
229 -I$(top_srcdir)/gst-libs \ 220 -I$(top_srcdir)/gst-libs \
@@ -232,7 +223,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
232 --library=libgstsdp-@GST_API_VERSION@.la \ 223 --library=libgstsdp-@GST_API_VERSION@.la \
233 --include=Gst-@GST_API_VERSION@ \ 224 --include=Gst-@GST_API_VERSION@ \
234 --libtool="$(LIBTOOL)" \ 225 --libtool="$(LIBTOOL)" \
235@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 226@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
236 $(INTROSPECTION_COMPILER) \ 227 $(INTROSPECTION_COMPILER) \
237 --includedir=$(srcdir) \ 228 --includedir=$(srcdir) \
238 --includedir=$(builddir) \ 229 --includedir=$(builddir) \
@@ -241,11 +232,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 232 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
242 233
243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 234 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
244Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 235diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
245=================================================================== 236index c86515b..363e6d2 100644
246--- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am 237--- a/gst-libs/gst/tag/Makefile.am
247+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 238+++ b/gst-libs/gst/tag/Makefile.am
248@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE 239@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
249 --c-include "gst/tag/tag.h" \ 240 --c-include "gst/tag/tag.h" \
250 -I$(top_srcdir)/gst-libs \ 241 -I$(top_srcdir)/gst-libs \
251 -I$(top_builddir)/gst-libs \ 242 -I$(top_builddir)/gst-libs \
@@ -256,7 +247,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
256 --library=libgsttag-@GST_API_VERSION@.la \ 247 --library=libgsttag-@GST_API_VERSION@.la \
257 --include=Gst-@GST_API_VERSION@ \ 248 --include=Gst-@GST_API_VERSION@ \
258 --include=GstBase-@GST_API_VERSION@ \ 249 --include=GstBase-@GST_API_VERSION@ \
259@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 250@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
260 $(INTROSPECTION_COMPILER) \ 251 $(INTROSPECTION_COMPILER) \
261 --includedir=$(srcdir) \ 252 --includedir=$(srcdir) \
262 --includedir=$(builddir) \ 253 --includedir=$(builddir) \
@@ -267,11 +258,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 258 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
268 259
269 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 260 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
270Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 261diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
271=================================================================== 262index 0f7c07e..d642267 100644
272--- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am 263--- a/gst-libs/gst/video/Makefile.am
273+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 264+++ b/gst-libs/gst/video/Makefile.am
274@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS 265@@ -121,8 +121,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
275 --c-include "gst/video/video.h" \ 266 --c-include "gst/video/video.h" \
276 -I$(top_srcdir)/gst-libs \ 267 -I$(top_srcdir)/gst-libs \
277 -I$(top_builddir)/gst-libs \ 268 -I$(top_builddir)/gst-libs \
@@ -282,7 +273,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
282 --library=libgstvideo-@GST_API_VERSION@.la \ 273 --library=libgstvideo-@GST_API_VERSION@.la \
283 --include=Gst-@GST_API_VERSION@ \ 274 --include=Gst-@GST_API_VERSION@ \
284 --include=GstBase-@GST_API_VERSION@ \ 275 --include=GstBase-@GST_API_VERSION@ \
285@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 276@@ -149,8 +149,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
286 $(INTROSPECTION_COMPILER) \ 277 $(INTROSPECTION_COMPILER) \
287 --includedir=$(srcdir) \ 278 --includedir=$(srcdir) \
288 --includedir=$(builddir) \ 279 --includedir=$(builddir) \
@@ -293,3 +284,6 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
293 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 284 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
294 285
295 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 286 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
287--
2882.7.4
289
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
index 9b66f7f4..9b66f7f4 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
index 4adf6054..4adf6054 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.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
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 00000000..23950b67
--- /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 @@
1From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 20 Jan 2016 13:00:00 -0800
4Subject: [PATCH] make gio_unix_2_0 dependency configurable
5
6Prior to 1.7.1, gst-plugins-base accepted a configure option to
7disable gio_unix_2_0, however it was implemented incorrectly using
8AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the
9dependency unconditional.
10
11 http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70
12
13To make builds deterministic, re-instate support for
14--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
15instead of AG_GST_CHECK_FEATURE.
16
17Upstream-Status: Pending
18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20
21---
22 configure.ac | 7 +++++++
23 1 file changed, 7 insertions(+)
24
25diff --git a/configure.ac b/configure.ac
26index 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
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
index 35b1a5f1..3ea3d571 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb
@@ -6,17 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 6 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
7 7
8GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" 8GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
9SRCBRANCH = "MM_04.03.05_1804_L4.9.88_MX7ULP_GA" 9SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2"
10 10
11SRC_URI = " \ 11SRC_URI = " \
12 ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ 12 ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
13 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 13 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
14 file://make-gio_unix_2_0-dependency-configurable.patch \
14 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ 15 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
15 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ 16 file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \
16 file://0003-riff-add-missing-include-directories-when-calling-in.patch \ 17 file://0003-riff-add-missing-include-directories-when-calling-in.patch \
17 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ 18 file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
18" 19"
19SRCREV = "7b637f65e7ce2b03c5adb7624501e74c575ac0f2" 20SRCREV = "04bafd740a52757f12496206cfabe282835a1eb5"
20 21
21DEFAULT_PREFERENCE = "-1" 22DEFAULT_PREFERENCE = "-1"
22 23
@@ -27,6 +28,9 @@ S = "${WORKDIR}/git"
27# Enable pango lib 28# Enable pango lib
28PACKAGECONFIG_append = " pango " 29PACKAGECONFIG_append = " pango "
29 30
31# Disable introspection to fix [GstGL-1.0.gir] Error
32EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland"
33
30# ion allocator will be enabled only when detecting the ion.h exists, which is built out from kernel. 34# ion allocator will be enabled only when detecting the ion.h exists, which is built out from kernel.
31# Now, ion allocator can be supported on all i.MX platform 35# Now, ion allocator can be supported on all i.MX platform
32DEPENDS_append = " iso-codes util-linux virtual/kernel" 36DEPENDS_append = " iso-codes util-linux virtual/kernel"
@@ -68,4 +72,6 @@ do_compile_prepend() {
68 export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" 72 export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs"
69} 73}
70 74
75FILES_${PN} += "${libdir}/gstreamer-1.0/include"
76
71COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" 77COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-26 20:33:16 +0000