From cfcaba9450b8708bbfe731279c08c1e11e1c5f08 Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Wed, 21 Nov 2012 10:28:01 +0100
Subject: [PATCH] meta-digi-del: Add patch to gst-fsl-plugin.

This patch comes from the meta-fsl-arm repo and it is not applied to
del-toolchain.git.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 ...x_segment_fault_in_v4lsink_for_yocto.patch | 31 +++++++++++++++++++
 .../gst-fsl-plugin_2.0.3.bbappend             |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/files/gst-fsl-plugin-2.0.3-0015-fix_segment_fault_in_v4lsink_for_yocto.patch

diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/files/gst-fsl-plugin-2.0.3-0015-fix_segment_fault_in_v4lsink_for_yocto.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/files/gst-fsl-plugin-2.0.3-0015-fix_segment_fault_in_v4lsink_for_yocto.patch
new file mode 100644
index 000000000..69cc42e9a
--- /dev/null
+++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/files/gst-fsl-plugin-2.0.3-0015-fix_segment_fault_in_v4lsink_for_yocto.patch
@@ -0,0 +1,31 @@
+diff -ruN gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_fb.c gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_fb.c
+--- gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_fb.c	2012-06-29 11:28:36.837384109 +0800
++++ gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_fb.c	2012-06-29 11:31:01.441387410 +0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2009-2011 Freescale Semiconductor, Inc. All rights reserved.
++ * Copyright (c) 2009-2012, Freescale Semiconductor, Inc. All rights reserved.
+  *
+  */
+ 
+@@ -236,6 +236,8 @@
+     ret = ioctl(v4l->fd_fb, FBIOGET_VSCREENINFO, &fb_var);
+     if (ret < 0) {
+         g_print("Unable to get resolution value\n");
++        v4l->fullscreen_width = 1024;
++        v4l->fullscreen_height = 768;
+         return FALSE;
+     }
+     v4l->fullscreen_width = fb_var.xres;
+diff -ruN gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_v4lsink.c gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+--- gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_v4lsink.c	2012-06-29 11:28:36.837384109 +0800
++++ gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_v4lsink.c	2012-06-29 11:32:26.337389344 +0800
+@@ -1427,7 +1427,7 @@
+             g_mutex_lock (v4l_info->flow_lock);
+             v4l_info->gstXInfo->running = FALSE;
+             g_mutex_unlock (v4l_info->flow_lock);
+-            if (v4l_info->x11enabled) {
++            if ((v4l_info->x11enabled) && (v4l_info->gstXInfo) && (v4l_info->gstXInfo->event_thread)) {
+                 g_thread_join (v4l_info->gstXInfo->event_thread);
+             }
+             if (v4l_info->gstXInfo->xwindow) {
diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/gst-fsl-plugin_2.0.3.bbappend b/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/gst-fsl-plugin_2.0.3.bbappend
index 9c94f43ba..b4a4b1ed6 100644
--- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/gst-fsl-plugin_2.0.3.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin_2.0.3/gst-fsl-plugin_2.0.3.bbappend
@@ -13,4 +13,5 @@ SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch"
 SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch"
 SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch"
 SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch"
+SRC_URI_append_del += "file://gst-fsl-plugin-2.0.3-0015-fix_segment_fault_in_v4lsink_for_yocto.patch"
 PR_append_del = "+${DISTRO}.0"