aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Viguera <javier.viguera@digi.com>2013-05-21 16:17:06 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2013-05-22 10:43:31 -0300
commitb93c40348cdcb0022f4315edc1b9cb7474253b1e (patch)
tree6296213fb3d3c7ed6c7ebf4bb1f7736173e2392d
parent87baff82973eb26086d22532ff5f41a643ef98b5 (diff)
downloadmeta-fsl-arm-b93c40348cdcb0022f4315edc1b9cb7474253b1e.tar.gz
meta-fsl-arm-b93c40348cdcb0022f4315edc1b9cb7474253b1e.tar.bz2
meta-fsl-arm-b93c40348cdcb0022f4315edc1b9cb7474253b1e.zip
gst-fsl-plugin: fix segfault due to not found library
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> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin/Use-librarys-SONAME-in-dlopen.patch29
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb5
2 files changed, 32 insertions, 2 deletions
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 dea6ed3..cbfee09 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}.3"
+PR = "${INC_PR}.4"
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"