summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-05-27 15:14:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-08 13:34:45 +0100
commitf2eb3d8068155168c54da9ef3cf7054b6110b88c (patch)
tree1af97f2ffbb5f3932c306e968e6ccdb46cba2928
parent1504f8f09bdee5164d822d1391f0538f758d34ac (diff)
downloadpoky-f2eb3d8068155168c54da9ef3cf7054b6110b88c.tar.gz
gstreamer1.0-plugins-bad: Fix missing library with bcm egl
userland graphics driver provided libegl for rpi depends upon symbols from vchostif library, therefore add it to linker cmdline helps with loadng gst-gl plugins on rpi (From OE-Core rev: c32dbe73f2089177a071ba81a9de82dac7741e44) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
new file mode 100644
index 0000000000..c382b17586
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
@@ -0,0 +1,35 @@
1Add -lvchostif to link when using -lEGL on rpi
2
3This is required because libEGL from userland uses sybols
4from this library.
5
6lib/libEGL.so.1.0.0 121: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
7 1552: 00000000 0 FUNC GLOBAL DEFAULT UND vc_dispmanx_element_add
8
9These symbols are provided by libvchostif as seen below
10
11lib/libvchostif.so
12 252: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
13 809: 0000b161 192 FUNC GLOBAL DEFAULT 9 vc_dispmanx_element_add
14
15With this explicit link, plugins fail during runtime
16
17(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstomx.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
18(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstopengl.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21
22Upstream-Status: Pending
23Index: gst-plugins-bad-1.10.4/configure.ac
24===================================================================
25--- gst-plugins-bad-1.10.4.orig/configure.ac
26+++ gst-plugins-bad-1.10.4/configure.ac
27@@ -785,7 +785,7 @@ case $host in
28 HAVE_EGL=yes
29 HAVE_GLES2=yes
30 HAVE_EGL_RPI=yes
31- EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm"
32+ EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm"
33 EGL_CFLAGS=""
34 AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform])
35 ])
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb
index 0bb4053e43..def03a9b81 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.10.4.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
18 file://0001-smoothstreaming-implement-adaptivedemux-s-get_live_s.patch \ 18 file://0001-smoothstreaming-implement-adaptivedemux-s-get_live_s.patch \
19 file://0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch \ 19 file://0001-smoothstreaming-use-the-duration-from-the-list-of-fr.patch \
20 file://0001-mssdemux-improved-live-playback-support.patch \ 20 file://0001-mssdemux-improved-live-playback-support.patch \
21 file://link-with-libvchostif.patch \
21" 22"
22SRC_URI[md5sum] = "2757103e57a096a1a05b3ab85b8381af" 23SRC_URI[md5sum] = "2757103e57a096a1a05b3ab85b8381af"
23SRC_URI[sha256sum] = "23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966" 24SRC_URI[sha256sum] = "23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966"