freescale-layer: imx-gst1.0-plugin: adapt patches for MM_04.09.00_2405_L6.6.y

While at it, add the "Upstream-Status" tag to the patches to avoid QA errors

https://onedigi.atlassian.net/browse/DEL-9011
https://onedigi.atlassian.net/browse/DEL-9081

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-05-22 15:12:07 +02:00
parent 2fb01c8f3e
commit 86d1dd0596
2 changed files with 13 additions and 11 deletions

View File

@ -9,6 +9,8 @@ is registered as /dev/video1.
In the mappings for video devices we must map /dev/video1 to /dev/fb0 so In the mappings for video devices we must map /dev/video1 to /dev/fb0 so
that the imxv4l2sink can work with it. that the imxv4l2sink can work with it.
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Hector Palacios <hector.palacios@digi.com> Signed-off-by: Hector Palacios <hector.palacios@digi.com>
https://jira.digi.com/browse/DEL-3399 https://jira.digi.com/browse/DEL-3399
@ -17,10 +19,10 @@ https://jira.digi.com/browse/DEL-3399
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c diff --git a/libs/v4l2_core/gstimxv4l2.c b/libs/v4l2_core/gstimxv4l2.c
index 257a60422e76..58cdcdad3ffd 100755 index 2c8eee9..3078cf1 100755
--- a/libs/v4l2_core/gstimxv4l2.c --- a/libs/v4l2_core/gstimxv4l2.c
+++ b/libs/v4l2_core/gstimxv4l2.c +++ b/libs/v4l2_core/gstimxv4l2.c
@@ -212,6 +212,7 @@ static guint g_camera_format_PXP[] = { @@ -208,6 +208,7 @@ static guint g_camera_format_PXP[] = {
static IMXV4l2DeviceMap g_device_maps[] = { static IMXV4l2DeviceMap g_device_maps[] = {
{"/dev/video0", FALSE, "/dev/fb0"}, {"/dev/video0", FALSE, "/dev/fb0"},

View File

@ -2,14 +2,16 @@ From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 2 Jan 2020 16:49:51 +0100 Date: Thu, 2 Jan 2020 16:49:51 +0100
Subject: [PATCH] imx-gst1.0-plugin: fix build using MUSL C library Subject: [PATCH] imx-gst1.0-plugin: fix build using MUSL C library
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
--- ---
tools/gplay2/gplay2.c | 1 - tools/gplay2/gplay2.c | 1 -
tools/grecorder/grecorder.c | 2 ++ tools/grecorder/grecorder.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-) 2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c
index 1e37521a06cc..f001a883d74f 100755 index 9e406b9..ae193b7 100755
--- a/tools/gplay2/gplay2.c --- a/tools/gplay2/gplay2.c
+++ b/tools/gplay2/gplay2.c +++ b/tools/gplay2/gplay2.c
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
@ -21,14 +23,12 @@ index 1e37521a06cc..f001a883d74f 100755
#include <pthread.h> #include <pthread.h>
#include <stdio.h> #include <stdio.h>
diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c diff --git a/tools/grecorder/grecorder.c b/tools/grecorder/grecorder.c
index c8eff2f53efd..841a0aa83fba 100644 index c315605..ee772b0 100644
--- a/tools/grecorder/grecorder.c --- a/tools/grecorder/grecorder.c
+++ b/tools/grecorder/grecorder.c +++ b/tools/grecorder/grecorder.c
@@ -24,7 +24,9 @@ @@ -27,6 +27,7 @@
#include <pthread.h> #include <unistd.h>
#include <signal.h> #include <glib.h>
#include <getopt.h>
+#include <unistd.h>
#define __USE_LARGEFILE64 #define __USE_LARGEFILE64
+#define _GNU_SOURCE # For MUSL statvfs64 +#define _GNU_SOURCE # For MUSL statvfs64
#include <sys/statvfs.h> #include <sys/statvfs.h>