summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>2020-09-01 20:21:07 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2020-09-28 11:08:08 -0300
commit8b5002dd2cff5b3e150297c15d8f4b1760a2b0bd (patch)
tree7fd306d134f6f5e0f0199aa314e80ac03e4862ee
parent2fadb832f721828748a134460b6e3f99e871c047 (diff)
downloadmeta-freescale-8b5002dd2cff5b3e150297c15d8f4b1760a2b0bd.tar.gz
gstreamer1.0: update to NXP release MM_04.05.05_2005_L5.4.24
Align recipes to match NXP release 5.4.24-2.1.0 by updating the branch to MM_04.05.05_2005_L5.4.24. Following notes are additions to the regular bump of recipes: -------------------------- gstreamer1.0-plugins-bad: Drop patches applied upstream and refresh all patches in layer with devtool to clean-up fuzz during apply. Backport patch to be able to compile with OpenCV 4.4.0 provided in upstream OE-Core. imx-gst1.0-plugin: Introduce the patch to solve compiler error reported when -fcommon is used in GCC10 configuration. -------------------------- Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> (cherry picked from commit eee0beb7da54159853b540e8e0ea4bed74eeeeda)
Diffstat
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch16
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch14
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch45
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch34
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.4.x.patch27
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch8
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch35
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch8
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch8
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb7
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb4
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb4
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb4
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch34
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb10
15 files changed, 116 insertions, 142 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch
index 088976d8..5e6a1c05 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-ext-wayland-fix-meson-build-in-nxp-fork.patch
@@ -1,4 +1,4 @@
1From e637d9f6bb961afcecb74faa6dff38562f6ce796 Mon Sep 17 00:00:00 2001 1From 9e092d8976db034a2d6848d738c4f73cc001fd09 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> 2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Sun, 26 Jan 2020 10:45:28 +0000 3Date: Sun, 26 Jan 2020 10:45:28 +0000
4Subject: [PATCH] ext/wayland: fix meson build in nxp fork 4Subject: [PATCH] ext/wayland: fix meson build in nxp fork
@@ -9,17 +9,18 @@ Subject: [PATCH] ext/wayland: fix meson build in nxp fork
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> 11Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
12
12--- 13---
13 ext/wayland/meson.build | 24 ++++++++++++++++++++++++ 14 ext/wayland/meson.build | 24 ++++++++++++++++++++++++
14 1 file changed, 24 insertions(+) 15 1 file changed, 24 insertions(+)
15 16
16diff --git a/ext/wayland/meson.build b/ext/wayland/meson.build 17diff --git a/ext/wayland/meson.build b/ext/wayland/meson.build
17index fa6fbf42f..eb425b14f 100644 18index 3c377eefb..98a7cb76f 100644
18--- a/ext/wayland/meson.build 19--- a/ext/wayland/meson.build
19+++ b/ext/wayland/meson.build 20+++ b/ext/wayland/meson.build
20@@ -8,6 +8,11 @@ wl_sources = [ 21@@ -10,6 +10,11 @@ wl_sources = [
21 'wllinuxdmabuf.c' 22
22 ] 23 libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland'))
23 24
24+imx_wl_sources = [ 25+imx_wl_sources = [
25+ 'wlutils.c', 26+ 'wlutils.c',
@@ -29,7 +30,7 @@ index fa6fbf42f..eb425b14f 100644
29 if use_wayland 30 if use_wayland
30 protocols_datadir = wl_protocol_dep.get_pkgconfig_variable('pkgdatadir') 31 protocols_datadir = wl_protocol_dep.get_pkgconfig_variable('pkgdatadir')
31 32
32@@ -19,6 +24,25 @@ if use_wayland 33@@ -21,6 +26,25 @@ if use_wayland
33 'fullscreen-shell-unstable-v1-protocol.c', 'fullscreen-shell-unstable-v1-client-protocol.h'], 34 'fullscreen-shell-unstable-v1-protocol.c', 'fullscreen-shell-unstable-v1-client-protocol.h'],
34 ['/stable/xdg-shell/xdg-shell.xml', 'xdg-shell-protocol.c', 'xdg-shell-client-protocol.h'], 35 ['/stable/xdg-shell/xdg-shell.xml', 'xdg-shell-protocol.c', 'xdg-shell-client-protocol.h'],
35 ] 36 ]
@@ -55,6 +56,3 @@ index fa6fbf42f..eb425b14f 100644
55 protocols_files = [] 56 protocols_files = []
56 57
57 foreach protodef: protocol_defs 58 foreach protodef: protocol_defs
58--
592.17.1
60
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
index 13218520..4f9041dc 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
@@ -1,8 +1,8 @@
1From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001 1From 69cff1595f9e0014c582c6f540d69d86d5e824ff Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> 2From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
3Date: Fri, 18 Oct 2019 00:39:12 +0100 3Date: Fri, 18 Oct 2019 00:39:12 +0100
4Subject: [PATCH 1/2] meson: build gir even when cross-compiling if 4Subject: [PATCH] meson: build gir even when cross-compiling if introspection
5 introspection was enabled explicitly 5 was enabled explicitly
6 6
7This can be made to work in certain circumstances when 7This can be made to work in certain circumstances when
8cross-compiling, so default to not building g-i stuff 8cross-compiling, so default to not building g-i stuff
@@ -14,15 +14,16 @@ See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
14Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19] 14Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19]
15 15
16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> 16Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
17
17--- 18---
18 meson.build | 2 +- 19 meson.build | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
20 21
21diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
22index 67aeeb4d0..7b3314bd9 100644 23index 2b492faea..bea89b23d 100644
23--- a/meson.build 24--- a/meson.build
24+++ b/meson.build 25+++ b/meson.build
25@@ -411,7 +411,7 @@ python3 = import('python').find_installation() 26@@ -405,7 +405,7 @@ python3 = import('python').find_installation()
26 27
27 gir = find_program('g-ir-scanner', required : get_option('introspection')) 28 gir = find_program('g-ir-scanner', required : get_option('introspection'))
28 gnome = import('gnome') 29 gnome = import('gnome')
@@ -31,6 +32,3 @@ index 67aeeb4d0..7b3314bd9 100644
31 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ 32 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
32 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ 33 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
33 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ 34 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
34--
352.17.1
36
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch
deleted file mode 100644
index 874b8abc..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From f41f356aebee916910453031c06c111000f2f261 Mon Sep 17 00:00:00 2001
2From: Christoph Reiter <reiter.christoph@gmail.com>
3Date: Sun, 5 May 2019 22:11:16 +0200
4Subject: [PATCH] meson: fix build with opencv=enabled and opencv4. Fixes #964
5
6Having the opencv feature enabled would lead to the opencv3 dependency
7being required which failed with only opencv4 being available.
8
9Instead don't require anything and error out at the end if the feature was enabled
10but no dependency was found.
11
12Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/22c6a4085f8792d8af0cdabfe1664d55ca2dee11]
13
14(cherry picked from commit 22c6a4085f8792d8af0cdabfe1664d55ca2dee11)
15Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
16---
17 gst-libs/gst/opencv/meson.build | 6 ++++--
18 1 file changed, 4 insertions(+), 2 deletions(-)
19
20diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
21index 3fd472fda..8dc2ad99b 100644
22--- a/gst-libs/gst/opencv/meson.build
23+++ b/gst-libs/gst/opencv/meson.build
24@@ -9,9 +9,9 @@ opencv_headers = [
25 'gstopencvvideofilter.h',
26 ]
27
28-opencv_dep = dependency('opencv', version : '>= 3.0.0', required : get_option('opencv'))
29+opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
30 if not opencv_dep.found()
31- opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : get_option('opencv'))
32+ opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
33 endif
34 if opencv_dep.found()
35 gstopencv = library('gstopencv-' + api_version,
36@@ -30,4 +30,6 @@ if opencv_dep.found()
37 dependencies : [gstvideo_dep, opencv_dep])
38
39 install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv')
40+elif get_option('opencv').enabled()
41+ error('OpenCV support enabled but required dependencies were not found.')
42 endif
43--
442.17.1
45
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch
deleted file mode 100644
index a9e1bd00..00000000
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.3.x.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From cfb196925312b3c3d7a19dbb9a3ce64d20d66409 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com>
3Date: Sat, 9 May 2020 19:56:51 +0000
4Subject: [PATCH] opencv: allow compilation against 4.3.x
5
6Backport upstream commit 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef to NXP
7fork of gstreamer1.0-plugins-bad.
8
9Original commit link:
10https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef
11
12Upstream-Status: Backport [4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef]
13
14Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
15---
16 ext/opencv/meson.build | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
20index d0ce1d3ee..05b142edc 100644
21--- a/ext/opencv/meson.build
22+++ b/ext/opencv/meson.build
23@@ -65,7 +65,7 @@ if opencv_found
24 endif
25 endforeach
26 else
27- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false)
28+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
29 opencv_found = opencv_dep.found()
30 if opencv_found
31 foreach h : libopencv4_headers
32--
332.17.1
34
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.4.x.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.4.x.patch
new file mode 100644
index 00000000..525f4a45
--- /dev/null
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-opencv-allow-compilation-against-4.4.x.patch
@@ -0,0 +1,27 @@
1From a4df38174d33dc1e620ea535e16cac406ff59da2 Mon Sep 17 00:00:00 2001
2From: Nicola Murino <nicola.murino@gmail.com>
3Date: Fri, 31 Jul 2020 23:38:56 +0200
4Subject: [PATCH] opencv: allow compilation against 4.4.x
5
6Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1482>
7
8Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/8544f3928ea46d2da3f27dc65576e8baf42a46d]
9Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
10
11---
12 ext/opencv/meson.build | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
16index a26403482..b3270e540 100644
17--- a/ext/opencv/meson.build
18+++ b/ext/opencv/meson.build
19@@ -65,7 +65,7 @@ if opencv_found
20 endif
21 endforeach
22 else
23- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
24+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], required : false)
25 opencv_found = opencv_dep.found()
26 if opencv_found
27 foreach h : libopencv4_headers
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
index 32261279..da2dd8bf 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
@@ -1,4 +1,4 @@
1From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001 1From 05f9a7a9025cb1c6a5592ba998ab95d565f9c76f Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 3 Feb 2016 18:05:41 -0800 3Date: Wed, 3 Feb 2016 18:05:41 -0800
4Subject: [PATCH] avoid including <sys/poll.h> directly 4Subject: [PATCH] avoid including <sys/poll.h> directly
@@ -8,12 +8,13 @@ musl libc generates warnings if <sys/poll.h> is included directly.
8Upstream-Status: Pending 8Upstream-Status: Pending
9 9
10Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 10Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
11
11--- 12---
12 sys/dvb/gstdvbsrc.c | 2 +- 13 sys/dvb/gstdvbsrc.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
14 15
15diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c 16diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
16index b93255f..49f145a 100644 17index bd07369c3..ebfbe4947 100644
17--- a/sys/dvb/gstdvbsrc.c 18--- a/sys/dvb/gstdvbsrc.c
18+++ b/sys/dvb/gstdvbsrc.c 19+++ b/sys/dvb/gstdvbsrc.c
19@@ -97,7 +97,7 @@ 20@@ -97,7 +97,7 @@
@@ -25,6 +26,3 @@ index b93255f..49f145a 100644
25 #include <fcntl.h> 26 #include <fcntl.h>
26 #include <errno.h> 27 #include <errno.h>
27 #include <stdio.h> 28 #include <stdio.h>
28--
291.9.1
30
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
index 2d5389d9..c25a11e9 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
@@ -1,4 +1,4 @@
1From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 Mon Sep 17 00:00:00 2001 1From f9a8b71897af39640894915a5f202d0027124f57 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 9 Feb 2016 14:00:00 -0800 3Date: Tue, 9 Feb 2016 14:00:00 -0800
4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc 4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
@@ -17,17 +17,18 @@ without an explicit cast to a pointer type.
17Upstream-Status: Pending 17Upstream-Status: Pending
18 18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20
20--- 21---
21 sys/decklink/gstdecklink.cpp | 10 +++++----- 22 sys/decklink/gstdecklink.cpp | 10 +++++-----
22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- 23 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
23 sys/decklink/gstdecklinkvideosink.cpp | 2 +- 24 sys/decklink/gstdecklinkvideosink.cpp | 2 +-
24 3 files changed, 7 insertions(+), 7 deletions(-) 25 3 files changed, 7 insertions(+), 7 deletions(-)
25 26
26Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp 27diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
27=================================================================== 28index 464b0de9d..9fb7246d3 100644
28--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp 29--- a/sys/decklink/gstdecklink.cpp
29+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp 30+++ b/sys/decklink/gstdecklink.cpp
30@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDeck 31@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
31 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, 32 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
32 "interlace-mode", G_TYPE_STRING, 33 "interlace-mode", G_TYPE_STRING,
33 mode->interlaced ? "interleaved" : "progressive", 34 mode->interlaced ? "interleaved" : "progressive",
@@ -36,7 +37,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
36 37
37 if (input && mode->interlaced) { 38 if (input && mode->interlaced) {
38 if (mode->tff) 39 if (mode->tff)
39@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDeck 40@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
40 case bmdFormat8BitYUV: /* '2vuy' */ 41 case bmdFormat8BitYUV: /* '2vuy' */
41 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", 42 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
42 "colorimetry", G_TYPE_STRING, mode->colorimetry, 43 "colorimetry", G_TYPE_STRING, mode->colorimetry,
@@ -57,11 +58,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
57 break; 58 break;
58 case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */ 59 case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
59 case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */ 60 case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
60Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp 61diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
61=================================================================== 62index 2fef934c8..c47229abf 100644
62--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp 63--- a/sys/decklink/gstdecklinkaudiosrc.cpp
63+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp 64+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
64@@ -387,7 +387,7 @@ gst_decklink_audio_src_set_caps (GstBase 65@@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
65 g_mutex_unlock (&self->input->lock); 66 g_mutex_unlock (&self->input->lock);
66 67
67 if (videosrc) { 68 if (videosrc) {
@@ -70,11 +71,11 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
70 gst_object_unref (videosrc); 71 gst_object_unref (videosrc);
71 72
72 switch (vconn) { 73 switch (vconn) {
73Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp 74diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
74=================================================================== 75index 7aea3f7a2..4864508bb 100644
75--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp 76--- a/sys/decklink/gstdecklinkvideosink.cpp
76+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp 77+++ b/sys/decklink/gstdecklinkvideosink.cpp
77@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * featu 78@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
78 gpointer user_data) 79 gpointer user_data)
79 { 80 {
80 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, 81 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
index 73681f10..7758300e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
@@ -1,4 +1,4 @@
1From a67781000e82bd9ae3813da29401e8c0c852328a Mon Sep 17 00:00:00 2001 1From e7914eb0baa3530a5075c0d3db7936ccddd8e3fe Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 26 Jan 2016 15:16:01 -0800 3Date: Tue, 26 Jan 2016 15:16:01 -0800
4Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os 4Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
@@ -6,12 +6,13 @@ Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 8Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
9
9--- 10---
10 gst-libs/gst/codecparsers/gstvc1parser.c | 2 +- 11 gst-libs/gst/codecparsers/gstvc1parser.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c 14diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
14index fd16ee0..ddb890c 100644 15index ac579712d..1686f6081 100644
15--- a/gst-libs/gst/codecparsers/gstvc1parser.c 16--- a/gst-libs/gst/codecparsers/gstvc1parser.c
16+++ b/gst-libs/gst/codecparsers/gstvc1parser.c 17+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
17@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, 18@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
@@ -23,6 +24,3 @@ index fd16ee0..ddb890c 100644
23 guint8 structA[8] = { 0, }; 24 guint8 structA[8] = { 0, };
24 guint8 structB[12] = { 0, }; 25 guint8 structB[12] = { 0, };
25 GstBitReader br; 26 GstBitReader br;
26--
271.9.1
28
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
index 3fe3f649..dc3a8c69 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch
@@ -1,7 +1,7 @@
1From 5830de9b1c8965683025082aeed7ccaf1dd85969 Mon Sep 17 00:00:00 2001 1From 387886b05f4ae0de9b7faf1f9ca66040d38d19ee Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> 2From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
3Date: Sun, 26 Jan 2020 19:55:06 +0000 3Date: Sun, 26 Jan 2020 19:55:06 +0000
4Subject: [PATCH 2/2] opencv: resolve missing opencv data dir in yocto build 4Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
5 5
6When Yocto build is performed, opencv searches for data dir using simple 6When Yocto build is performed, opencv searches for data dir using simple
7test command, and this fails because pkg-config provides an absolute 7test command, and this fails because pkg-config provides an absolute
@@ -11,6 +11,7 @@ in order for the 'test' utility to pick up the absolute path.
11Upstream-Status: Inappropriate [OE-specific] 11Upstream-Status: Inappropriate [OE-specific]
12 12
13Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> 13Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
14
14--- 15---
15 ext/opencv/meson.build | 7 ++++--- 16 ext/opencv/meson.build | 7 ++++---
16 1 file changed, 4 insertions(+), 3 deletions(-) 17 1 file changed, 4 insertions(+), 3 deletions(-)
@@ -44,6 +45,3 @@ index f38b55dfe..a26403482 100644
44 if r.returncode() == 0 45 if r.returncode() == 0
45 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' 46 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
46 else 47 else
47--
482.17.1
49
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
index 59aeca11..cf0b8263 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb
@@ -13,20 +13,19 @@ PACKAGE_ARCH_imxpxp = "${MACHINE_SOCARCH}"
13PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}" 13PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}"
14 14
15GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" 15GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
16SRCBRANCH = "MM_04.05.03_1911_L5.4.0" 16SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
17 17
18SRC_URI = " \ 18SRC_URI = " \
19 ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ 19 ${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \
20 file://0001-ext-wayland-fix-meson-build-in-nxp-fork.patch \ 20 file://0001-ext-wayland-fix-meson-build-in-nxp-fork.patch \
21 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ 21 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
22 file://0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch \
23 file://0001-opencv-allow-compilation-against-4.3.x.patch \
24 file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ 22 file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
23 file://0001-opencv-allow-compilation-against-4.4.x.patch \
25 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ 24 file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
26 file://avoid-including-sys-poll.h-directly.patch \ 25 file://avoid-including-sys-poll.h-directly.patch \
27 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ 26 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
28" 27"
29SRCREV = "b80b6a2db690c815a88c2450956e23e86dbd6538" 28SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a"
30 29
31S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
32 31
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
index ae372729..4b25f406 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
6 6
7GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" 7GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
8SRCBRANCH = "MM_04.05.03_1911_L5.4.0" 8SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
9SRCREV = "289e06a129224b530d23b6d41f0a65cc341109c5" 9SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329"
10SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ 10SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
11 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \ 11 file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
12 file://0001-gstreamer-plugins-base-fix-meson-build-in-nxp-fork.patch \ 12 file://0001-gstreamer-plugins-base-fix-meson-build-in-nxp-fork.patch \
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
index 6134789d..b85b7842 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb
@@ -2,12 +2,12 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
2 2
3 3
4GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" 4GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
5SRCBRANCH = "MM_04.05.03_1911_L5.4.0" 5SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
6 6
7SRC_URI = " \ 7SRC_URI = " \
8 ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ 8 ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
9" 9"
10SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918" 10SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8"
11 11
12DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
13 13
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
index f344db2d..3dc60b66 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
15 15
16# Use i.MX fork of GST for customizations 16# Use i.MX fork of GST for customizations
17GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" 17GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
18SRCBRANCH = "MM_04.05.03_1911_L5.4.0" 18SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
19 19
20SRC_URI = " \ 20SRC_URI = " \
21 ${GST1.0_SRC};branch=${SRCBRANCH} \ 21 ${GST1.0_SRC};branch=${SRCBRANCH} \
@@ -25,7 +25,7 @@ SRC_URI = " \
25 file://0004-meson-Add-option-for-installed-tests.patch \ 25 file://0004-meson-Add-option-for-installed-tests.patch \
26 file://capfix.patch \ 26 file://capfix.patch \
27" 27"
28SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" 28SRCREV = "beca1b382febc2ba38a21fcb8f5092209773eb7f"
29 29
30S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
31 31
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch
new file mode 100644
index 00000000..9a0afea5
--- /dev/null
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch
@@ -0,0 +1,34 @@
1From eb89cd344535706c6194359bd1f1fed50162a041 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com>
3Date: Tue, 1 Sep 2020 08:24:52 +0000
4Subject: [PATCH] fsl_parser.h: fix compiler error with -fcommon
5
6When -fcommon is set in GCC10 configuration, following error is produced
7during linking:
8./git/ext-includes/fsl_parser.h:598: multiple definition of `TrackExtTagIndex';
9./git/ext-includes/fsl_parser.h:598: first defined here
10
11Remove unused enum name to resolve multiple definitions, it is not used
12anywhere in the code base.
13
14Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
15---
16 ext-includes/fsl_parser.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/ext-includes/fsl_parser.h b/ext-includes/fsl_parser.h
20index d3aae20..c037c9a 100755
21--- a/ext-includes/fsl_parser.h
22+++ b/ext-includes/fsl_parser.h
23@@ -595,7 +595,7 @@ enum{
24 FSL_PARSER_TRACKEXTTAG_CRYPTO_ENCRYPTED_BYTE_BLOCK,
25 FSL_PARSER_TRACKEXTTAG_CRYPTO_SKIP_BYTE_BLOCK,
26 FSL_PARSER_TRACKEXTTAG_CRYPTO_IV,
27-}TrackExtTagIndex;
28+};
29
30 typedef struct _SeiPosition
31 {
32--
332.17.1
34
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb
index 4e244715..f2b33d96 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.3.bb
@@ -20,11 +20,13 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin"
20LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ 20LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
21 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" 21 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
22 22
23IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https" 23SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
24SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
25 24
26SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}" 25SRC_URI = " \
27SRCREV = "190b80c50aa06d2fe32423f6e36d76374bb530b2" 26 git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
27 file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \
28"
29SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54"
28 30
29S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"
30 32
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-09 22:00:26 +0000