Patchwork [meta-fsl-arm,7/8] gst-fsl-plugin: Drop 2.0.3 patches which were kept around by mistake

login
register
mail settings
Submitter Otavio Salvador
Date July 17, 2013, 6:17 p.m.
Message ID <1374085031-2116-7-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/53911/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - July 17, 2013, 6:17 p.m.
Following patches were specific to 2.0.3 version but kept around when
updating to 3.0.7 version:

 - fix_segment_fault_in_v4lsink_for_yocto.patch
 - Use-librarys-SONAME-in-dlopen.patch

All those are being removed by this patch.

Change-Id: I80956586a8487ff96f3646788490c68a144a30e4
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../Use-librarys-SONAME-in-dlopen.patch            | 29 --------------------
 .../fix_segment_fault_in_v4lsink_for_yocto.patch   | 31 ----------------------
 2 files changed, 60 deletions(-)
 delete mode 100644 recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch
 delete mode 100644 recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch

Patch

diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch b/recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch
deleted file mode 100644
index 6349844..0000000
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From: Javier Viguera <javier.viguera@digi.com>
-Date: Tue, 21 May 2013 16:52:52 +0200
-Subject: [PATCH] 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());
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch b/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch
deleted file mode 100644
index 69cc42e..0000000
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin/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) {