Patchwork [meta-fsl-arm] gst-fsl-plugin: fix segfault due to not found library

login
register
mail settings
Submitter Javier Viguera
Date May 21, 2013, 4:17 p.m.
Message ID <1369153026-13155-1-git-send-email-javier.viguera@digi.com>
Download mbox | patch
Permalink /patch/50267/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Javier Viguera - May 21, 2013, 4:17 p.m.
The gst-fsl-plugin package tries to 'dlopen' a library using the
symbolic link that points to the library file. But that symbolic link is
only installed with the development package (PN-dev), not with the
normal package.

This commit adds a patch that uses the soname of the library in dlopen
call.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../Use-librarys-SONAME-in-dlopen.patch            | 29 ++++++++++++++++++++++
 .../gst-plugins/gst-fsl-plugin_2.0.3.bb            |  5 ++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch
Otavio Salvador - May 22, 2013, 1:04 p.m.
On Tue, May 21, 2013 at 1:17 PM, Javier Viguera <javier.viguera@digi.com>wrote:

> The gst-fsl-plugin package tries to 'dlopen' a library using the
> symbolic link that points to the library file. But that symbolic link is
> only installed with the development package (PN-dev), not with the
> normal package.
>
> This commit adds a patch that uses the soname of the library in dlopen
> call.
>
> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
>

I applied it to master and dylan-next.
Javier Viguera - May 22, 2013, 1:34 p.m.
On 22/05/13 15:04, Otavio Salvador wrote:
> I applied it to master and dylan-next.

Good, thanks.

I would like to have this also fixed in *danny*. That's the revision we 
are currently working with.

I'll send the danny version later so you can review/apply.

-
Regards,

Javier Viguera
Otavio Salvador - May 22, 2013, 1:44 p.m.
On Wed, May 22, 2013 at 10:34 AM, Javier Viguera <javier.viguera@digi.com>wrote:

>
> On 22/05/13 15:04, Otavio Salvador wrote:
>
>> I applied it to master and dylan-next.
>>
>
> Good, thanks.
>
> I would like to have this also fixed in *danny*. That's the revision we
> are currently working with.
>
> I'll send the danny version later so you can review/apply.
>

I pushed this to danny-next; give it a try and let me know if it works for
you.
Javier Viguera - May 22, 2013, 2:44 p.m.
On 22/05/13 15:44, Otavio Salvador wrote:
> I pushed this to danny-next; give it a try and let me know if it works
> for you.

Tested.

It works perfect, thanks.

-
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.
Otavio Salvador - May 22, 2013, 2:51 p.m.
On Wed, May 22, 2013 at 11:44 AM, Javier Viguera <javier.viguera@digi.com>wrote:

>
>
> On 22/05/13 15:44, Otavio Salvador wrote:
>
>> I pushed this to danny-next; give it a try and let me know if it works
>> for you.
>>
>
> Tested.
>
> It works perfect, thanks.
>

Great; pushed it to danny and dylan then.

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
new file mode 100644
index 0000000..6349844
--- /dev/null
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-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] 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_2.0.3.bb b/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
index 3e3db2b..f16e6c6 100644
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
@@ -5,10 +5,11 @@  require gst-fsl-plugin.inc
 DEPENDS += "fsl-mm-codeclib fsl-mm-flv-codeclib fsl-mm-mp3enc-codeclib"
 RDEPENDS_${PN} = "fsl-mm-codeclib fsl-mm-flv-codeclib fsl-mm-mp3enc-codeclib"
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 SRC_URI += "file://fix_segment_fault_in_v4lsink_for_yocto.patch \
-            file://fix-missing-sys-types-h.patch"
+            file://fix-missing-sys-types-h.patch \
+            file://Use-librarys-SONAME-in-dlopen.patch"
 
 SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e"
 SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0"