From c6d61e82054647c9c3371ca7143cf89497a03a49 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 4 Dec 2012 09:50:02 +0100 Subject: [PATCH] gst-fsl-plugin: Use upstream source. DEL patches are still applied on meta-digi-del. Signed-off-by: Alex Gonzalez --- .../gst-plugins/gst-fsl-plugin_2.0.3.bbappend | 9 ------ ...x_segment_fault_in_v4lsink_for_yocto.patch | 31 ------------------- .../gst-fsl-plugin_2.0.3.bbappend | 1 - 3 files changed, 41 deletions(-) delete mode 100644 meta-digi-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend delete 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-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend b/meta-digi-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend deleted file mode 100644 index 5383f10c6..000000000 --- a/meta-digi-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2012 Digi International -PR_append = "digi.0" - -SRC_URI = "${DIGI_LOG_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "ab9fcca9d46a61c898862bcf18e3843c" -SRC_URI[sha256sum] = "a05cf407518528d10a2086e6952e5e93da3d311e1be0f8f20a8d765520afdd78" - -INSANE_SKIP_${PN} += "dev-deps" 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 deleted file mode 100644 index 69cc42e9a..000000000 --- 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 +++ /dev/null @@ -1,31 +0,0 @@ -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 f3e64b3b4..b0d726069 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,5 +13,4 @@ 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"