From 5ef0b68628870b9612585350acb6e4c5c6db2657 Mon Sep 17 00:00:00 2001
From: Rogerio Pimentel <rogerio.pimentel@freescale.com>
Date: Mon, 2 Jul 2012 10:09:31 -0500
Subject: [PATCH] gst-fsl-plugin: fix mfw_v4lsink to play on X11

This patch applies a patch on gst-fsl-plugin package to fixing
mfw_v4lsink to play on X11.

Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
---
 ...x_segment_fault_in_v4lsink_for_yocto.patch | 31 +++++++++++++++++++
 .../gst-plugins/gst-fsl-plugin_2.0.3.bb       |  5 +--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch

diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch
new file mode 100644
index 00000000..69cc42e9
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/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-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
index 4b12827d..2631d65e 100644
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
@@ -9,13 +9,14 @@ LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
 SECTION = "multimedia"
 DEPENDS = "gstreamer gst-plugins-base fsl-mm-codeclib imx-lib"
 RDEPENDS_${PN} = "fsl-mm-codeclib"
-PR = "r3"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
                     file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
 
-SRC_URI = "file://${PN}-${PV}.tar.gz"
+SRC_URI = "file://${PN}-${PV}.tar.gz \
+          file://fix_segment_fault_in_v4lsink_for_yocto.patch"
 SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e"
 SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0"
 
-- 
2.40.1