diff options
author | Rogerio Pimentel <rogerio.pimentel@freescale.com> | 2012-07-02 10:09:31 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-07-02 14:41:20 -0300 |
commit | a71028ee01ef818ae3a82d5403ce45282a1ef59d (patch) | |
tree | a509d30c216773c8dfe7c3b6b077fdec10514429 /recipes-multimedia | |
parent | 97a097660aa1ec9ea1b95fafa45a19227a64a47c (diff) | |
download | meta-fsl-arm-a71028ee01ef818ae3a82d5403ce45282a1ef59d.tar.gz |
gst-fsl-plugin: fix mfw_v4lsink to play on X11
This patch applies a patch on gst-fsl-plugin package to fixing
mfw_v4lsink to play on X11.
Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r-- | recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch | 31 | ||||
-rw-r--r-- | recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb | 5 |
2 files changed, 34 insertions, 2 deletions
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 new file mode 100644 index 0000000..69cc42e --- /dev/null +++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix_segment_fault_in_v4lsink_for_yocto.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | 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 | ||
2 | --- gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_fb.c 2012-06-29 11:28:36.837384109 +0800 | ||
3 | +++ gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_fb.c 2012-06-29 11:31:01.441387410 +0800 | ||
4 | @@ -1,5 +1,5 @@ | ||
5 | /* | ||
6 | - * Copyright (C) 2009-2011 Freescale Semiconductor, Inc. All rights reserved. | ||
7 | + * Copyright (c) 2009-2012, Freescale Semiconductor, Inc. All rights reserved. | ||
8 | * | ||
9 | */ | ||
10 | |||
11 | @@ -236,6 +236,8 @@ | ||
12 | ret = ioctl(v4l->fd_fb, FBIOGET_VSCREENINFO, &fb_var); | ||
13 | if (ret < 0) { | ||
14 | g_print("Unable to get resolution value\n"); | ||
15 | + v4l->fullscreen_width = 1024; | ||
16 | + v4l->fullscreen_height = 768; | ||
17 | return FALSE; | ||
18 | } | ||
19 | v4l->fullscreen_width = fb_var.xres; | ||
20 | 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 | ||
21 | --- gst-fsl-plugin-2.0.3.orig/src/misc/v4l_sink/src/mfw_gst_v4lsink.c 2012-06-29 11:28:36.837384109 +0800 | ||
22 | +++ gst-fsl-plugin-2.0.3/src/misc/v4l_sink/src/mfw_gst_v4lsink.c 2012-06-29 11:32:26.337389344 +0800 | ||
23 | @@ -1427,7 +1427,7 @@ | ||
24 | g_mutex_lock (v4l_info->flow_lock); | ||
25 | v4l_info->gstXInfo->running = FALSE; | ||
26 | g_mutex_unlock (v4l_info->flow_lock); | ||
27 | - if (v4l_info->x11enabled) { | ||
28 | + if ((v4l_info->x11enabled) && (v4l_info->gstXInfo) && (v4l_info->gstXInfo->event_thread)) { | ||
29 | g_thread_join (v4l_info->gstXInfo->event_thread); | ||
30 | } | ||
31 | if (v4l_info->gstXInfo->xwindow) { | ||
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 4b12827..2631d65 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 | |||
@@ -9,13 +9,14 @@ LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" | |||
9 | SECTION = "multimedia" | 9 | SECTION = "multimedia" |
10 | DEPENDS = "gstreamer gst-plugins-base fsl-mm-codeclib imx-lib" | 10 | DEPENDS = "gstreamer gst-plugins-base fsl-mm-codeclib imx-lib" |
11 | RDEPENDS_${PN} = "fsl-mm-codeclib" | 11 | RDEPENDS_${PN} = "fsl-mm-codeclib" |
12 | PR = "r3" | 12 | PR = "r4" |
13 | 13 | ||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 14 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
15 | file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | 15 | file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ |
16 | file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" | 16 | file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" |
17 | 17 | ||
18 | SRC_URI = "file://${PN}-${PV}.tar.gz" | 18 | SRC_URI = "file://${PN}-${PV}.tar.gz \ |
19 | file://fix_segment_fault_in_v4lsink_for_yocto.patch" | ||
19 | SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e" | 20 | SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e" |
20 | SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0" | 21 | SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0" |
21 | 22 | ||