summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2020-10-29 14:27:47 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-31 08:54:12 +0000
commit4650ec0450f97e92f9c6fa25d0e24a5518b0f3b9 (patch)
tree3b5747aea724991f9e1de283de6ddbea8d8c7289 /meta/recipes-multimedia/gstreamer
parent673ca0031589fc52e11b01a5aa2ec335aaf692f2 (diff)
downloadpoky-4650ec0450f97e92f9c6fa25d0e24a5518b0f3b9.tar.gz
gstreamer1.0-plugins-base: upgrade to version 1.18.0
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch * 0002-meson-Add-variables-for-gir-files.patch Removed since these are included in 1.18.0 License-Update: remove file://common/coverage/coverage-report.pl Upstream dont have it any more. API and plugin documentation are no longer built with gtk_doc. The gtk_doc documentation has been removed in favour of a new unified documentation module built with hotdoc. Distributors should use the documentation release tarball instead of trying to package hotdoc and building the documentation from scratch. (From OE-Core rev: 5485ecd65987f5a2c0824cf6f691ccb3f529c86e) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch)12
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch36
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch235
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch)10
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch)8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch)8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb)31
7 files changed, 33 insertions, 307 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
index a4727e23ea..d5d9838372 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch
@@ -1,14 +1,13 @@
1From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001 1From f9d48cd85ee68207733b1b91a00453462c33524a Mon Sep 17 00:00:00 2001
2From: zhouming <b42586@freescale.com> 2From: zhouming <b42586@freescale.com>
3Date: Wed, 14 May 2014 10:16:20 +0800 3Date: Wed, 14 May 2014 10:16:20 +0800
4Subject: [PATCH] ENGR00312515: get caps from src pad when query caps 4Subject: [PATCH 1/4] ENGR00312515: get caps from src pad when query caps
5 5
6https://bugzilla.gnome.org/show_bug.cgi?id=728312 6https://bugzilla.gnome.org/show_bug.cgi?id=728312
7 7
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Signed-off-by: zhouming <b42586@freescale.com> 10Signed-off-by: zhouming <b42586@freescale.com>
11
12--- 11---
13 gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ 12 gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
14 1 file changed, 13 insertions(+) 13 1 file changed, 13 insertions(+)
@@ -17,10 +16,10 @@ Signed-off-by: zhouming <b42586@freescale.com>
17diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c 16diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
18old mode 100644 17old mode 100644
19new mode 100755 18new mode 100755
20index 8a127c8..71c5d78 19index f545857..62d10ef
21--- a/gst-libs/gst/tag/gsttagdemux.c 20--- a/gst-libs/gst/tag/gsttagdemux.c
22+++ b/gst-libs/gst/tag/gsttagdemux.c 21+++ b/gst-libs/gst/tag/gsttagdemux.c
23@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) 22@@ -1777,6 +1777,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
24 } 23 }
25 break; 24 break;
26 } 25 }
@@ -40,3 +39,6 @@ index 8a127c8..71c5d78
40 default: 39 default:
41 res = gst_pad_query_default (pad, parent, query); 40 res = gst_pad_query_default (pad, parent, query);
42 break; 41 break;
42--
432.28.0
44
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
deleted file mode 100644
index 49ab471414..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 30672ba7d134553e59935ddc875104adba26f25c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Thu, 17 Oct 2019 20:06:24 +0100
4Subject: [PATCH] meson: build gir even when cross-compiling if introspection
5 was enabled explicitly
6
7This can be made to work in certain circumstances when
8cross-compiling, so default to not building g-i stuff
9when cross-compiling, but allow it if introspection was
10enabled explicitly via -Dintrospection=enabled.
11
12See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
13
14Upstream-Status: Backport [30672ba7d134553e59935ddc875104adba26f25c]
15
16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
17---
18 meson.build | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/meson.build b/meson.build
22index 264d84c9e..c8147c224 100644
23--- a/meson.build
24+++ b/meson.build
25@@ -372,7 +372,7 @@ endif
26
27 gir = find_program('g-ir-scanner', required : get_option('introspection'))
28 gnome = import('gnome')
29-build_gir = gir.found() and not meson.is_cross_build()
30+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
31 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
32 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
33 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
34--
352.17.1
36
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
deleted file mode 100644
index ca85744c19..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-meson-Add-variables-for-gir-files.patch
+++ /dev/null
@@ -1,235 +0,0 @@
1From 685731e989dc074a4b0d48b6c8062e2738f09719 Mon Sep 17 00:00:00 2001
2From: Thibault Saunier <tsaunier@igalia.com>
3Date: Mon, 22 Oct 2018 11:44:37 +0200
4Subject: [PATCH] meson: Add variables for gir files
5
6And flatten list of sources for dependencies
7
8Upstream-Status: Backport [685731e989dc074a4b0d48b6c8062e2738f09719]
9
10Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
11---
12 gst-libs/gst/allocators/meson.build | 5 +++--
13 gst-libs/gst/app/meson.build | 6 ++++--
14 gst-libs/gst/audio/meson.build | 5 +++--
15 gst-libs/gst/pbutils/meson.build | 5 +++--
16 gst-libs/gst/rtp/meson.build | 6 ++++--
17 gst-libs/gst/rtsp/meson.build | 5 +++--
18 gst-libs/gst/sdp/meson.build | 6 ++++--
19 gst-libs/gst/tag/meson.build | 5 +++--
20 gst-libs/gst/video/meson.build | 5 +++--
21 9 files changed, 30 insertions(+), 18 deletions(-)
22
23diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
24index 364baeebf..56f156dc3 100644
25--- a/gst-libs/gst/allocators/meson.build
26+++ b/gst-libs/gst/allocators/meson.build
27@@ -22,7 +22,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
28 allocators_gen_sources = []
29 if build_gir
30 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/allocators/allocators.h' ]
31- allocators_gen_sources += [gnome.generate_gir(gstallocators,
32+ allocators_gir = gnome.generate_gir(gstallocators,
33 sources : gst_allocators_sources + gst_allocators_headers,
34 namespace : 'GstAllocators',
35 nsversion : api_version,
36@@ -33,7 +33,8 @@ if build_gir
37 install : true,
38 extra_args : gst_gir_extra_args,
39 dependencies : [gst_dep]
40- )]
41+ )
42+ allocators_gen_sources += allocators_gir
43 endif
44
45 allocators_dep = declare_dependency(link_with: gstallocators,
46diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build
47index 81dd0f42c..7a90f5e10 100644
48--- a/gst-libs/gst/app/meson.build
49+++ b/gst-libs/gst/app/meson.build
50@@ -32,7 +32,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
51
52 if build_gir
53 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/app/app.h' ]
54- app_gen_sources += [gnome.generate_gir(gstapp,
55+ app_gir = gnome.generate_gir(gstapp,
56 sources : app_sources + app_headers + [gstapp_c] + [gstapp_h],
57 namespace : 'GstApp',
58 nsversion : api_version,
59@@ -43,7 +43,9 @@ if build_gir
60 install : true,
61 extra_args : gst_gir_extra_args,
62 dependencies : [gst_dep, gst_base_dep]
63- )]
64+ )
65+
66+ app_gen_sources += app_gir
67 endif
68
69 app_dep = declare_dependency(link_with: gstapp,
70diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
71index 0e4efab2e..2a449d4bf 100644
72--- a/gst-libs/gst/audio/meson.build
73+++ b/gst-libs/gst/audio/meson.build
74@@ -153,7 +153,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
75
76 if build_gir
77 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/audio/audio.h' ]
78- audio_gen_sources += [gnome.generate_gir(gstaudio,
79+ audio_gir = gnome.generate_gir(gstaudio,
80 sources : audio_src + audio_headers + [gstaudio_c] + [gstaudio_h],
81 namespace : 'GstAudio',
82 nsversion : api_version,
83@@ -164,7 +164,8 @@ if build_gir
84 install : true,
85 extra_args : gst_gir_extra_args,
86 dependencies : gstaudio_deps
87- )]
88+ )
89+ audio_gen_sources += [audio_gir]
90 endif
91
92 audio_dep = declare_dependency(link_with : gstaudio,
93diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
94index 2faf62622..0e96722fd 100644
95--- a/gst-libs/gst/pbutils/meson.build
96+++ b/gst-libs/gst/pbutils/meson.build
97@@ -63,7 +63,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
98 pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
99 if build_gir
100 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
101- pbutils_gen_sources += [gnome.generate_gir(pbutils,
102+ pbutils_gir = gnome.generate_gir(pbutils,
103 sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
104 namespace : 'GstPbutils',
105 nsversion : api_version,
106@@ -74,7 +74,8 @@ if build_gir
107 install : true,
108 extra_args : gst_gir_extra_args,
109 dependencies : gstpbutils_deps
110- )]
111+ )
112+ pbutils_gen_sources += [pbutils_gir]
113 endif
114
115 pbutils_dep = declare_dependency(link_with : pbutils,
116diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build
117index f47ec6592..7ea6658d5 100644
118--- a/gst-libs/gst/rtp/meson.build
119+++ b/gst-libs/gst/rtp/meson.build
120@@ -49,7 +49,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
121 rtp_gen_sources = [gstrtp_enum_h]
122 if build_gir
123 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtp/rtp.h' ]
124- rtp_gen_sources += [gnome.generate_gir(gst_rtp,
125+ rtp_gir = gnome.generate_gir(gst_rtp,
126 sources : rtp_sources + rtp_headers + [gstrtp_enum_c] + [gstrtp_enum_h],
127 namespace : 'GstRtp',
128 nsversion : api_version,
129@@ -60,7 +60,9 @@ if build_gir
130 install : true,
131 extra_args : gst_gir_extra_args,
132 dependencies : gstrtp_deps
133- )]
134+ )
135+
136+ rtp_gen_sources += [rtp_gir]
137 endif
138
139
140diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
141index 27e309d5a..3632adceb 100644
142--- a/gst-libs/gst/rtsp/meson.build
143+++ b/gst-libs/gst/rtsp/meson.build
144@@ -54,7 +54,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
145 rtsp_gen_sources = [gstrtsp_h]
146 if build_gir
147 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtsp/rtsp.h' ]
148- rtsp_gen_sources += [gnome.generate_gir(gst_rtsp,
149+ rtsp_gir = gnome.generate_gir(gst_rtsp,
150 sources : rtsp_sources + rtsp_headers + [gstrtsp_c] + [gstrtsp_h],
151 namespace : 'GstRtsp',
152 nsversion : api_version,
153@@ -65,7 +65,8 @@ if build_gir
154 install : true,
155 extra_args : gst_gir_extra_args,
156 dependencies : gstrtsp_deps + [sdp_dep]
157- )]
158+ )
159+ rtsp_gen_sources += [rtsp_gir]
160 endif
161
162 rtsp_dep = declare_dependency(link_with : gst_rtsp,
163diff --git a/gst-libs/gst/sdp/meson.build b/gst-libs/gst/sdp/meson.build
164index 62c18b732..24cdb5293 100644
165--- a/gst-libs/gst/sdp/meson.build
166+++ b/gst-libs/gst/sdp/meson.build
167@@ -23,7 +23,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
168 sdp_gen_sources = []
169 if build_gir
170 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/sdp/sdp.h' ]
171- sdp_gen_sources += [gnome.generate_gir(gstsdp,
172+ sdp_gir = gnome.generate_gir(gstsdp,
173 sources : gst_sdp_sources + gst_sdp_headers,
174 namespace : 'GstSdp',
175 nsversion : api_version,
176@@ -34,7 +34,9 @@ if build_gir
177 install : true,
178 extra_args : gst_gir_extra_args,
179 dependencies : rtsp_deps
180- )]
181+ )
182+
183+ sdp_gen_sources += [sdp_gir]
184 endif
185
186 sdp_dep = declare_dependency(link_with: gstsdp,
187diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
188index 27e66fd63..5ec37392a 100644
189--- a/gst-libs/gst/tag/meson.build
190+++ b/gst-libs/gst/tag/meson.build
191@@ -93,7 +93,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
192
193 if build_gir
194 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/tag/tag.h' ]
195- tag_gen_sources += [gnome.generate_gir(gsttag,
196+ tag_gir = gnome.generate_gir(gsttag,
197 sources : tag_sources + tag_headers + [gsttag_h] + [gsttag_c],
198 namespace : 'GstTag',
199 nsversion : api_version,
200@@ -104,7 +104,8 @@ if build_gir
201 install : true,
202 extra_args : gst_gir_extra_args,
203 dependencies : tag_deps
204- )]
205+ )
206+ tag_gen_sources += [tag_gir]
207 endif
208
209 tag_dep = declare_dependency(link_with: gsttag,
210diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
211index 5b35e1943..bf77aa157 100644
212--- a/gst-libs/gst/video/meson.build
213+++ b/gst-libs/gst/video/meson.build
214@@ -138,7 +138,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
215
216 if build_gir
217 gst_gir_extra_args = gir_init_section + [ '--c-include=gst/video/video.h' ]
218- video_gen_sources += [gnome.generate_gir(gstvideo,
219+ video_gir = gnome.generate_gir(gstvideo,
220 sources : video_sources + video_headers + [gstvideo_c] + [gstvideo_h],
221 namespace : 'GstVideo',
222 nsversion : api_version,
223@@ -149,7 +149,8 @@ if build_gir
224 install : true,
225 extra_args : gst_gir_extra_args,
226 dependencies : gstvideo_deps
227- )]
228+ )
229+ video_gen_sources += [video_gir]
230 endif
231
232 video_dep = declare_dependency(link_with : gstvideo,
233--
2342.17.1
235
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
index 9e95524057..e453a500c9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-ssaparse-enhance-SSA-text-lines-parsing.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch
@@ -1,7 +1,7 @@
1From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001 1From f587861bbe12ad0b10370f835592746aafedbf56 Mon Sep 17 00:00:00 2001
2From: Mingke Wang <mingke.wang@freescale.com> 2From: Mingke Wang <mingke.wang@freescale.com>
3Date: Thu, 19 Mar 2015 14:17:10 +0800 3Date: Thu, 19 Mar 2015 14:17:10 +0800
4Subject: [PATCH] ssaparse: enhance SSA text lines parsing. 4Subject: [PATCH 2/4] ssaparse: enhance SSA text lines parsing.
5 5
6some parser will pass in the original ssa text line which starts with "Dialog:" 6some parser will pass in the original ssa text line which starts with "Dialog:"
7and there's are maybe multiple Dialog lines in one input buffer. 7and there's are maybe multiple Dialog lines in one input buffer.
@@ -9,9 +9,8 @@ and there's are maybe multiple Dialog lines in one input buffer.
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] 9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496]
10 10
11Signed-off-by: Mingke Wang <mingke.wang@freescale.com> 11Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
12
13--- 12---
14 gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++----- 13 gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++----
15 1 file changed, 134 insertions(+), 16 deletions(-) 14 1 file changed, 134 insertions(+), 16 deletions(-)
16 mode change 100644 => 100755 gst/subparse/gstssaparse.c 15 mode change 100644 => 100755 gst/subparse/gstssaparse.c
17 16
@@ -225,3 +224,6 @@ index c849c08..4b9636c
225 224
226 if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { 225 if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) {
227 GstSegment segment; 226 GstSegment segment;
227--
2282.28.0
229
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
index 6e53d2e8b5..2af83ff8b9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-viv-fb-Make-sure-config.h-is-included.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch
@@ -1,7 +1,7 @@
1From bec38a0c2e2958927c42b2f9ae939969b7c4a326 Mon Sep 17 00:00:00 2001 1From 153f3b83a3fed77785bd1420bed8bbafa2d791b3 Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <crg7475@mailbox.org> 2From: Carlos Rafael Giani <crg7475@mailbox.org>
3Date: Tue, 21 May 2019 14:01:11 +0200 3Date: Tue, 21 May 2019 14:01:11 +0200
4Subject: [PATCH] viv-fb: Make sure config.h is included 4Subject: [PATCH 3/4] viv-fb: Make sure config.h is included
5 5
6This prevents build errors due to missing GST_API_* symbols 6This prevents build errors due to missing GST_API_* symbols
7 7
@@ -13,7 +13,7 @@ Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
13 1 file changed, 4 insertions(+) 13 1 file changed, 4 insertions(+)
14 14
15diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h 15diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h
16index 05e1f6229..96ce5e685 100644 16index 05e1f62..96ce5e6 100644
17--- a/gst-libs/gst/gl/gl-prelude.h 17--- a/gst-libs/gst/gl/gl-prelude.h
18+++ b/gst-libs/gst/gl/gl-prelude.h 18+++ b/gst-libs/gst/gl/gl-prelude.h
19@@ -22,6 +22,10 @@ 19@@ -22,6 +22,10 @@
@@ -28,5 +28,5 @@ index 05e1f6229..96ce5e685 100644
28 28
29 #ifdef BUILDING_GST_GL 29 #ifdef BUILDING_GST_GL
30-- 30--
312.17.1 312.28.0
32 32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch
index e8094f459e..f45ea65ef3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-glimagesink-Downrank-to-marginal.patch
@@ -1,7 +1,7 @@
1From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001 1From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 24 Sep 2015 19:47:32 +0300 3Date: Thu, 24 Sep 2015 19:47:32 +0300
4Subject: [PATCH] glimagesink: Downrank to marginal 4Subject: [PATCH 4/4] glimagesink: Downrank to marginal
5 5
6On desktop, where there is good OpenGL, xvimagesink will come up first, 6On desktop, where there is good OpenGL, xvimagesink will come up first,
7on other platforms, OpenGL can't be trusted because it's either software (like 7on other platforms, OpenGL can't be trusted because it's either software (like
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c 17diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
18index a4b2540..0ccaacd 100644 18index 302e845..463be9c 100644
19--- a/ext/gl/gstopengl.c 19--- a/ext/gl/gstopengl.c
20+++ b/ext/gl/gstopengl.c 20+++ b/ext/gl/gstopengl.c
21@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin) 21@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin)
@@ -28,5 +28,5 @@ index a4b2540..0ccaacd 100644
28 } 28 }
29 29
30-- 30--
312.1.4 312.28.0
32 32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb
index 6563b6f738..7fe5a480d4 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.18.0.bb
@@ -1,26 +1,22 @@
1require gstreamer1.0-plugins-common.inc 1require gstreamer1.0-plugins-common.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ 4LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 5
6 6SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
7SRC_URI = " \ 7 file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
8 https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ 8 file://0003-viv-fb-Make-sure-config.h-is-included.patch \
9 file://get-caps-from-src-pad-when-query-caps.patch \ 9 file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
10 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ 10 file://0004-glimagesink-Downrank-to-marginal.patch \
11 file://0002-meson-Add-variables-for-gir-files.patch \ 11 "
12 file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \ 12SRC_URI[md5sum] = "5ea9dc2692335e03170c3639901c2d83"
13 file://0005-viv-fb-Make-sure-config.h-is-included.patch \ 13SRC_URI[sha256sum] = "762abdd1a950809a1cea62fff7f86b5f7d6bd5f6841e3e585c700b823cdb7897"
14 file://0009-glimagesink-Downrank-to-marginal.patch \
15 "
16SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c"
17SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"
18 14
19S = "${WORKDIR}/gst-plugins-base-${PV}" 15S = "${WORKDIR}/gst-plugins-base-${PV}"
20 16
21DEPENDS += "iso-codes util-linux zlib" 17DEPENDS += "iso-codes util-linux zlib"
22 18
23inherit gobject-introspection gtk-doc 19inherit gobject-introspection
24 20
25PACKAGES_DYNAMIC =+ "^libgst.*" 21PACKAGES_DYNAMIC =+ "^libgst.*"
26 22
@@ -74,16 +70,13 @@ OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayla
74OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}" 70OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}"
75 71
76EXTRA_OEMESON += " \ 72EXTRA_OEMESON += " \
73 -Ddoc=disabled \
77 -Dgl-graphene=disabled \ 74 -Dgl-graphene=disabled \
78 ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \ 75 ${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \
79 ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \ 76 ${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \
80 ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ 77 ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \
81" 78"
82 79
83GTKDOC_MESON_OPTION = "gtk_doc"
84GTKDOC_MESON_ENABLE_FLAG = "enabled"
85GTKDOC_MESON_DISABLE_FLAG = "disabled"
86
87FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" 80FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
88FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" 81FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
89 82