gst-fsl-plugin: synchronize with DEL's package

We found that the gst-fsl-plugin package from Yocto is not exactly the
same than the one we used in DEL even though they have the same
version.

We think the one we used in DEL (released by FSL via LTIB) is more
recent and has some fixes, so create a first patch that applies on top
of the one in Yocto and convert it to the one in DEL.

Also instead of appending new patches to meta-fsl-arm SRC_URI, override
completely the variable and add the patches from meta-fsl-arm layer in
our own layer.

The final result is: we use the yocto tarball, then apply a first patch
that converts it to the one in DEL/LTIB, then apply the patches from
meta-fsl-arm and finally the ones added by us.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0002-meta-fsl-arm-fix-segment-fault-in-v4lsink-for-yocto.patch

@@ -0,0 +1,43 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Mon, 25 Nov 2013 10:26:37 +0100
+Subject: [PATCH] meta-fsl-arm: fix segment fault in v4lsink for yocto
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ src/misc/v4l_sink/src/mfw_gst_fb.c      | 4 +++-
+ src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
+index 8c251da..291c2a1 100755
+--- a/src/misc/v4l_sink/src/mfw_gst_fb.c
++++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
+@@ -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 @@ gboolean mfw_gst_fb0_get_resolution(MFW_GST_V4LSINK_INFO_T *v4l)
+     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 --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+index c6a6b6c..dfdb926 100755
+--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
++++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
+@@ -1431,7 +1431,7 @@ mfw_gst_v4lsink_change_state (GstElement * element, GstStateChange transition)
+             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) {

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0003-meta-fsl-arm-fix-missing-sys-types.h.patch

@@ -0,0 +1,26 @@
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Fri, 22 Nov 2013 17:54:22 +0100
+Subject: [PATCH] meta-fsl-arm: fix missing sys/types.h
+
+Fix a build failure due to missing uint definition
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ src/misc/v4l_sink/src/mfw_gst_fb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
+index 291c2a1..18d4f7f 100755
+--- a/src/misc/v4l_sink/src/mfw_gst_fb.c
++++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
+@@ -39,6 +39,7 @@
+ 
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ //#if ((!defined (_MX233)) && (!defined (_MX28)) && (!defined (_MX50)))
+ //#include <linux/mxcfb.h>
+ //#else

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0004-meta-fsl-arm-Use-library-s-SONAME-in-dlopen.patch

@@ -0,0 +1,29 @@
+From: Javier Viguera <javier.viguera@digi.com>
+Date: Tue, 21 May 2013 16:52:52 +0200
+Subject: [PATCH] meta-fsl-arm: Use library's SONAME in dlopen
+
+The 'libmfwba.so' symbolic link is only installed with the development
+package, and without that symlink some gstreamer pipelines (mostly using
+mfw_isink) fail with:
+
+Can not open dll, libmfwba.so: cannot open shared object file: No such file or directory.
+Caught SIGSEGV accessing address (nil)
+
+Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+---
+ libs/vss/vss_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c
+index 757c2fc..2044051 100755
+--- a/libs/vss/vss_common.c
++++ b/libs/vss/vss_common.c
+@@ -86,7 +86,7 @@ static void * g_dlhandle = NULL;
+ void open_allocator_dll()
+ {
+     char * errstr;
+-    g_dlhandle = dlopen("libmfwba.so", RTLD_LAZY);
++    g_dlhandle = dlopen("libmfwba.so.0", RTLD_LAZY);
+     
+     if (!g_dlhandle) {
+         printf("Can not open dll, %s.\n", dlerror());

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0005-gplay_fullscreen.patch

@@ -32,7 +32,7 @@ index 8c2ed72..b85879a 100755
  
      return ( mfw_gst_v4l2_set_crop(v4l_info, width, height) );
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-index 20bf126..a3ba4a6 100755
+index dfdb926..3598fdb 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 @@ -976,7 +976,7 @@ mfw_gst_v4lsink_show_frame (GstBaseSink * basesink, GstBuffer * buf)
@@ -45,7 +45,7 @@ index 20bf126..a3ba4a6 100755
                  return GST_FLOW_OK;
              }
 diff --git a/tools/gplay/mfw_gplay_core.c b/tools/gplay/mfw_gplay_core.c
-index 8361499..04be21b 100755
+index 4705cac..e5569fc 100755
 --- a/tools/gplay/mfw_gplay_core.c
 +++ b/tools/gplay/mfw_gplay_core.c
 @@ -1583,6 +1583,9 @@ fsl_player_ret_val fsl_player_resize(fsl_player_handle handle, fsl_player_displa

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0006-add-fb-dev.patch

@@ -18,10 +18,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  5 files changed, 29 insertions(+), 3 deletions(-)
 
 diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c
-index 8c251daa5df4..a0df95f09494 100755
+index 18d4f7f..d03a874 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_fb.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_fb.c
-@@ -199,11 +199,14 @@ POST-CONDITIONS:    None
+@@ -200,11 +200,14 @@ POST-CONDITIONS:    None
  IMPORTANT NOTES:    None
  =============================================================================*/
  
@@ -38,7 +38,7 @@ index 8c251daa5df4..a0df95f09494 100755
  	     open(fb_device, O_RDWR, 0)) < 0) {
  	    g_print("Unable to open %s %d\n", fb_device, *fb);
 diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.h b/src/misc/v4l_sink/src/mfw_gst_fb.h
-index 01321d65488d..da11ca1cffd0 100755
+index 01321d6..da11ca1 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_fb.h
 +++ b/src/misc/v4l_sink/src/mfw_gst_fb.h
 @@ -50,7 +50,7 @@
@@ -51,7 +51,7 @@ index 01321d65488d..da11ca1cffd0 100755
  
  #if ((defined (_MX37) || defined (_MX51)) && defined (LOC_ALPHA_SUPPORT))
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c
-index b85879a057dd..d773f6aa5192 100755
+index b85879a..d773f6a 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4l.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4l.c
 @@ -540,6 +540,10 @@ mfw_gst_v4l2_mx37_mx51_tv_close (MFW_GST_V4LSINK_INFO_T * v4l_info)
@@ -66,7 +66,7 @@ index b85879a057dd..d773f6aa5192 100755
  
      v4l_info->tv_mode = NV_MODE;
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-index 238d91956543..3a50bffedfe4 100755
+index 3598fdb..4a6c642 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 @@ -137,6 +137,7 @@ enum
@@ -100,7 +100,7 @@ index 238d91956543..3a50bffedfe4 100755
      case SETPARA:
          g_value_set_int (value, v4l_info->setpara);
          break;
-@@ -1537,6 +1547,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
+@@ -1541,6 +1551,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
      v4l_info->dump_location = NULL;
      v4l_info->dumpfile = NULL;
      v4l_info->dump_length = 0;
@@ -108,7 +108,7 @@ index 238d91956543..3a50bffedfe4 100755
      v4l_info->cr_left_bypixel_orig = 0;
      v4l_info->cr_right_bypixel_orig = 0;
      v4l_info->cr_top_bypixel_orig = 0;
-@@ -1569,7 +1580,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
+@@ -1573,7 +1584,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
      memset (&v4l_info->crop, 0, sizeof (struct v4l2_crop));
      memset (&v4l_info->prevCrop, 0, sizeof (struct v4l2_crop));
  
@@ -117,7 +117,7 @@ index 238d91956543..3a50bffedfe4 100755
  
      v4l_info->chipcode = getChipCode();
      v4l_info->v4l_id = -1;
-@@ -1726,6 +1737,13 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass)
+@@ -1730,6 +1741,13 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass)
                                                            NULL,
                                                            G_PARAM_READWRITE));
  
@@ -132,7 +132,7 @@ index 238d91956543..3a50bffedfe4 100755
      g_object_class_install_property (gobject_class, PROP_FORCE_ASPECT_RATIO,
                                       g_param_spec_boolean
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
-index 504e06fb4ef0..28cd6b767ccf 100755
+index 504e06f..28cd6b7 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
 @@ -279,6 +279,7 @@ typedef struct MFW_GST_V4LSINK_INFO_S

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0010-gplay_rotate.patch

@@ -42,10 +42,10 @@ index d773f6a..cb999d2 100755
      if (ioctl (v4l_info->v4l_id, VIDIOC_S_CROP, crop) < 0) {
          GST_ERROR ("set crop failed");
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-index 526699e..2227c3d 100755
+index 4a6c642..de55b9d 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-@@ -1536,6 +1536,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
+@@ -1534,6 +1534,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info,
      v4l_info->axis_left = 0;
      v4l_info->rotate = 0;
      v4l_info->prevRotate = 0;
@@ -54,7 +54,7 @@ index 526699e..2227c3d 100755
      v4l_info->crop_top = 0;
  
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
-index 4764868..4c9465d 100755
+index 28cd6b7..159d3e7 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h
 @@ -255,6 +255,7 @@ typedef struct MFW_GST_V4LSINK_INFO_S

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0013-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch

@@ -17,10 +17,10 @@ Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-index 2227c3d..3ba9c78 100755
+index de55b9d..ce03ee4 100755
 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
 +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
-@@ -1848,6 +1848,7 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
+@@ -1847,6 +1847,7 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset,
      gint frame_buffer_size;
      gint max_frames;
      gint hwbuffernumforcodec;

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0014-gplay_next_file.patch

@@ -15,10 +15,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c
-index 0bcd78c..45b49da 100755
+index ee65100..de11e68 100755
 --- a/tools/gplay/mfw_gplay.c
 +++ b/tools/gplay/mfw_gplay.c
-@@ -881,6 +881,7 @@ int main(int argc,char *argv[])
+@@ -876,6 +876,7 @@ int main(int argc,char *argv[])
              case '>': // Play next file
                  printf("next\n");
                  if (playlist_next(pplayer, opt)==NULL){

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin-2.0.3/0015-gplay_repeat.patch

@@ -18,7 +18,7 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c
-index 45b49da..bc0bd7a 100755
+index de11e68..5e5a6f1 100755
 --- a/tools/gplay/mfw_gplay.c
 +++ b/tools/gplay/mfw_gplay.c
 @@ -151,6 +151,7 @@ PlayItem * playlist_next(fsl_player_handle handle, options* opt)

meta-digi-dey/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend

@@ -5,21 +5,26 @@ PR_append = "+${DISTRO}"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-SRC_URI += " \
+SRC_URI = " \
-    file://0001-gplay_fullscreen.patch \
+    ${FSL_MIRROR}/${PACKAGE_NAME}-${PV}.tar.gz \
-    file://0002-add-fb-dev.patch \
+    file://0001-gst-fsl-plugin-update-to-DEL-revision.patch \
-    file://0003-mfw_v4lsrc_uyvy.patch \
+    file://0002-meta-fsl-arm-fix-segment-fault-in-v4lsink-for-yocto.patch \
-    file://0004-mfw_v4lsec_def_sizes.patch \
+    file://0003-meta-fsl-arm-fix-missing-sys-types.h.patch \
-    file://0005-mfw_v4lsrc_create_segfault.patch \
+    file://0004-meta-fsl-arm-Use-library-s-SONAME-in-dlopen.patch \
-    file://0006-gplay_rotate.patch \
+    file://0005-gplay_fullscreen.patch \
-    file://0007-mfw_isink-Set-defaults-if-no-vssconfig-found.patch \
+    file://0006-add-fb-dev.patch \
-    file://0008-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch \
+    file://0007-mfw_v4lsrc_uyvy.patch \
-    file://0009-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch \
+    file://0008-mfw_v4lsec_def_sizes.patch \
-    file://0010-gplay_next_file.patch \
+    file://0009-mfw_v4lsrc_create_segfault.patch \
-    file://0011-gplay_repeat.patch \
+    file://0010-gplay_rotate.patch \
-    file://0012-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch \
+    file://0011-mfw_isink-Set-defaults-if-no-vssconfig-found.patch \
-    file://0013-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch \
+    file://0012-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch \
-    file://0014-undefined-shm_open.patch \
+    file://0013-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch \
+    file://0014-gplay_next_file.patch \
+    file://0015-gplay_repeat.patch \
+    file://0016-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch \
+    file://0017-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch \
+    file://0018-undefined-shm_open.patch \
 "
 
 do_install_append() {