-From e637d9f6bb961afcecb74faa6dff38562f6ce796 Mon Sep 17 00:00:00 2001
+From 9e092d8976db034a2d6848d738c4f73cc001fd09 Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Date: Sun, 26 Jan 2020 10:45:28 +0000
Subject: [PATCH] ext/wayland: fix meson build in nxp fork
Upstream-Status: Pending
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
+
---
ext/wayland/meson.build | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/ext/wayland/meson.build b/ext/wayland/meson.build
-index fa6fbf42f..eb425b14f 100644
+index 3c377eefb..98a7cb76f 100644
--- a/ext/wayland/meson.build
+++ b/ext/wayland/meson.build
-@@ -8,6 +8,11 @@ wl_sources = [
- 'wllinuxdmabuf.c'
- ]
+@@ -10,6 +10,11 @@ wl_sources = [
+
+ libdrm_dep = dependency('libdrm', version: '>= 2.4.55', required:get_option('wayland'))
+imx_wl_sources = [
+ 'wlutils.c',
if use_wayland
protocols_datadir = wl_protocol_dep.get_pkgconfig_variable('pkgdatadir')
-@@ -19,6 +24,25 @@ if use_wayland
+@@ -21,6 +26,25 @@ if use_wayland
'fullscreen-shell-unstable-v1-protocol.c', 'fullscreen-shell-unstable-v1-client-protocol.h'],
['/stable/xdg-shell/xdg-shell.xml', 'xdg-shell-protocol.c', 'xdg-shell-client-protocol.h'],
]
protocols_files = []
foreach protodef: protocol_defs
---
-2.17.1
-
-From 97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19 Mon Sep 17 00:00:00 2001
+From 69cff1595f9e0014c582c6f540d69d86d5e824ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Fri, 18 Oct 2019 00:39:12 +0100
-Subject: [PATCH 1/2] meson: build gir even when cross-compiling if
- introspection was enabled explicitly
+Subject: [PATCH] meson: build gir even when cross-compiling if introspection
+ was enabled explicitly
This can be made to work in certain circumstances when
cross-compiling, so default to not building g-i stuff
Upstream-Status: Backport [97a4d0cd7de8cfbf983acc7e37ba2f8fb73c3e19]
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
+
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 67aeeb4d0..7b3314bd9 100644
+index 2b492faea..bea89b23d 100644
--- a/meson.build
+++ b/meson.build
-@@ -411,7 +411,7 @@ python3 = import('python').find_installation()
+@@ -405,7 +405,7 @@ python3 = import('python').find_installation()
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
---
-2.17.1
-
+++ /dev/null
-From f41f356aebee916910453031c06c111000f2f261 Mon Sep 17 00:00:00 2001
-From: Christoph Reiter <reiter.christoph@gmail.com>
-Date: Sun, 5 May 2019 22:11:16 +0200
-Subject: [PATCH] meson: fix build with opencv=enabled and opencv4. Fixes #964
-
-Having the opencv feature enabled would lead to the opencv3 dependency
-being required which failed with only opencv4 being available.
-
-Instead don't require anything and error out at the end if the feature was enabled
-but no dependency was found.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/22c6a4085f8792d8af0cdabfe1664d55ca2dee11]
-
-(cherry picked from commit 22c6a4085f8792d8af0cdabfe1664d55ca2dee11)
-Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
----
- gst-libs/gst/opencv/meson.build | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
-index 3fd472fda..8dc2ad99b 100644
---- a/gst-libs/gst/opencv/meson.build
-+++ b/gst-libs/gst/opencv/meson.build
-@@ -9,9 +9,9 @@ opencv_headers = [
- 'gstopencvvideofilter.h',
- ]
-
--opencv_dep = dependency('opencv', version : '>= 3.0.0', required : get_option('opencv'))
-+opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
- if not opencv_dep.found()
-- opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : get_option('opencv'))
-+ opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
- endif
- if opencv_dep.found()
- gstopencv = library('gstopencv-' + api_version,
-@@ -30,4 +30,6 @@ if opencv_dep.found()
- dependencies : [gstvideo_dep, opencv_dep])
-
- install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv')
-+elif get_option('opencv').enabled()
-+ error('OpenCV support enabled but required dependencies were not found.')
- endif
---
-2.17.1
-
+++ /dev/null
-From cfb196925312b3c3d7a19dbb9a3ce64d20d66409 Mon Sep 17 00:00:00 2001
-From: Andrey Zhizhikin <andrey.z@gmail.com>
-Date: Sat, 9 May 2020 19:56:51 +0000
-Subject: [PATCH] opencv: allow compilation against 4.3.x
-
-Backport upstream commit 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef to NXP
-fork of gstreamer1.0-plugins-bad.
-
-Original commit link:
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef
-
-Upstream-Status: Backport [4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef]
-
-Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
----
- ext/opencv/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
-index d0ce1d3ee..05b142edc 100644
---- a/ext/opencv/meson.build
-+++ b/ext/opencv/meson.build
-@@ -65,7 +65,7 @@ if opencv_found
- endif
- endforeach
- else
-- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false)
-+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
- opencv_found = opencv_dep.found()
- if opencv_found
- foreach h : libopencv4_headers
---
-2.17.1
-
--- /dev/null
+From a4df38174d33dc1e620ea535e16cac406ff59da2 Mon Sep 17 00:00:00 2001
+From: Nicola Murino <nicola.murino@gmail.com>
+Date: Fri, 31 Jul 2020 23:38:56 +0200
+Subject: [PATCH] opencv: allow compilation against 4.4.x
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1482>
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/8544f3928ea46d2da3f27dc65576e8baf42a46d]
+Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
+
+---
+ ext/opencv/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
+index a26403482..b3270e540 100644
+--- a/ext/opencv/meson.build
++++ b/ext/opencv/meson.build
+@@ -65,7 +65,7 @@ if opencv_found
+ endif
+ endforeach
+ else
+- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], required : false)
+ opencv_found = opencv_dep.found()
+ if opencv_found
+ foreach h : libopencv4_headers
-From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001
+From 05f9a7a9025cb1c6a5592ba998ab95d565f9c76f Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 3 Feb 2016 18:05:41 -0800
Subject: [PATCH] avoid including <sys/poll.h> directly
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
---
sys/dvb/gstdvbsrc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
-index b93255f..49f145a 100644
+index bd07369c3..ebfbe4947 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -97,7 +97,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
---
-1.9.1
-
-From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 Mon Sep 17 00:00:00 2001
+From f9a8b71897af39640894915a5f202d0027124f57 Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Tue, 9 Feb 2016 14:00:00 -0800
Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
---
sys/decklink/gstdecklink.cpp | 10 +++++-----
sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
sys/decklink/gstdecklinkvideosink.cpp | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
-Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
-===================================================================
---- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp
-+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
-@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDeck
+diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
+index 464b0de9d..9fb7246d3 100644
+--- a/sys/decklink/gstdecklink.cpp
++++ b/sys/decklink/gstdecklink.cpp
+@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
"pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
"interlace-mode", G_TYPE_STRING,
mode->interlaced ? "interleaved" : "progressive",
if (input && mode->interlaced) {
if (mode->tff)
-@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDeck
+@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f,
case bmdFormat8BitYUV: /* '2vuy' */
gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
"colorimetry", G_TYPE_STRING, mode->colorimetry,
break;
case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
-Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
-===================================================================
---- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp
-+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
-@@ -387,7 +387,7 @@ gst_decklink_audio_src_set_caps (GstBase
+diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
+index 2fef934c8..c47229abf 100644
+--- a/sys/decklink/gstdecklinkaudiosrc.cpp
++++ b/sys/decklink/gstdecklinkaudiosrc.cpp
+@@ -379,7 +379,7 @@ gst_decklink_audio_src_start (GstDecklinkAudioSrc * self)
g_mutex_unlock (&self->input->lock);
if (videosrc) {
gst_object_unref (videosrc);
switch (vconn) {
-Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp
-===================================================================
---- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp
-+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp
-@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * featu
+diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
+index 7aea3f7a2..4864508bb 100644
+--- a/sys/decklink/gstdecklinkvideosink.cpp
++++ b/sys/decklink/gstdecklinkvideosink.cpp
+@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
gpointer user_data)
{
gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
-From a67781000e82bd9ae3813da29401e8c0c852328a Mon Sep 17 00:00:00 2001
+From e7914eb0baa3530a5075c0d3db7936ccddd8e3fe Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Tue, 26 Jan 2016 15:16:01 -0800
Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
---
gst-libs/gst/codecparsers/gstvc1parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c
-index fd16ee0..ddb890c 100644
+index ac579712d..1686f6081 100644
--- a/gst-libs/gst/codecparsers/gstvc1parser.c
+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
guint8 structA[8] = { 0, };
guint8 structB[12] = { 0, };
GstBitReader br;
---
-1.9.1
-
-From 5830de9b1c8965683025082aeed7ccaf1dd85969 Mon Sep 17 00:00:00 2001
+From 387886b05f4ae0de9b7faf1f9ca66040d38d19ee Mon Sep 17 00:00:00 2001
From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Date: Sun, 26 Jan 2020 19:55:06 +0000
-Subject: [PATCH 2/2] opencv: resolve missing opencv data dir in yocto build
+Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build
When Yocto build is performed, opencv searches for data dir using simple
test command, and this fails because pkg-config provides an absolute
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
+
---
ext/opencv/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
if r.returncode() == 0
gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"'
else
---
-2.17.1
-
PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}"
GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
+SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRC_URI = " \
${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \
file://0001-ext-wayland-fix-meson-build-in-nxp-fork.patch \
file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
- file://0001-meson-fix-build-with-opencv-enabled-and-opencv4.-Fix.patch \
- file://0001-opencv-allow-compilation-against-4.3.x.patch \
file://opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
+ file://0001-opencv-allow-compilation-against-4.4.x.patch \
file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
file://avoid-including-sys-poll.h-directly.patch \
file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
"
-SRCREV = "b80b6a2db690c815a88c2450956e23e86dbd6538"
+SRCREV = "2fdaef1839ebfef7ea3bc8c1c59463a9ef0ae19a"
S = "${WORKDIR}/git"
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https"
-SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
-SRCREV = "289e06a129224b530d23b6d41f0a65cc341109c5"
+SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
+SRCREV = "cad00a3c4318c787c9661990e8f9328e4a69a329"
SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \
file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
file://0001-gstreamer-plugins-base-fix-meson-build-in-nxp-fork.patch \
GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
-SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
+SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRC_URI = " \
${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
"
-SRCREV = "3bcc85705695ee629ac3fb687411bb196d231918"
+SRCREV = "fc6d8ccf3bd775517fafb1ce1d9224312d2812d8"
DEFAULT_PREFERENCE = "-1"
# Use i.MX fork of GST for customizations
GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
+SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
SRC_URI = " \
${GST1.0_SRC};branch=${SRCBRANCH} \
file://0004-meson-Add-option-for-installed-tests.patch \
file://capfix.patch \
"
-SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259"
+SRCREV = "beca1b382febc2ba38a21fcb8f5092209773eb7f"
S = "${WORKDIR}/git"
--- /dev/null
+From eb89cd344535706c6194359bd1f1fed50162a041 Mon Sep 17 00:00:00 2001
+From: Andrey Zhizhikin <andrey.z@gmail.com>
+Date: Tue, 1 Sep 2020 08:24:52 +0000
+Subject: [PATCH] fsl_parser.h: fix compiler error with -fcommon
+
+When -fcommon is set in GCC10 configuration, following error is produced
+during linking:
+./git/ext-includes/fsl_parser.h:598: multiple definition of `TrackExtTagIndex';
+./git/ext-includes/fsl_parser.h:598: first defined here
+
+Remove unused enum name to resolve multiple definitions, it is not used
+anywhere in the code base.
+
+Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
+---
+ ext-includes/fsl_parser.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext-includes/fsl_parser.h b/ext-includes/fsl_parser.h
+index d3aae20..c037c9a 100755
+--- a/ext-includes/fsl_parser.h
++++ b/ext-includes/fsl_parser.h
+@@ -595,7 +595,7 @@ enum{
+ FSL_PARSER_TRACKEXTTAG_CRYPTO_ENCRYPTED_BYTE_BLOCK,
+ FSL_PARSER_TRACKEXTTAG_CRYPTO_SKIP_BYTE_BLOCK,
+ FSL_PARSER_TRACKEXTTAG_CRYPTO_IV,
+-}TrackExtTagIndex;
++};
+
+ typedef struct _SeiPosition
+ {
+--
+2.17.1
+
LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
-IMXGST_SRC ?= "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https"
-SRCBRANCH = "MM_04.05.03_1911_L5.4.0"
+SRCBRANCH = "MM_04.05.05_2005_L5.4.24"
-SRC_URI = "${IMXGST_SRC};branch=${SRCBRANCH}"
-SRCREV = "190b80c50aa06d2fe32423f6e36d76374bb530b2"
+SRC_URI = " \
+ git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
+ file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \
+"
+SRCREV = "4d2e5c1547c5f8a5e4e26a034ab87c809b34fb54"
S = "${WORKDIR}/git"
