summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-07-16 14:00:50 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-07-31 16:24:25 -0300
commita9c81032a572fe8d6892698582519305d14b6857 (patch)
tree69a1d0b7dc0cf173f9fb212aab39de685d27b5dc
parent76fe078dc296b11dc6c3ab954572d7971336b47a (diff)
downloadmeta-freescale-a9c81032a572fe8d6892698582519305d14b6857.tar.gz
gst-fsl-plugin: Update to 3.0.8 version
This release had many patches merged upstream and thus those are being removed. Following patches were merged: - Link-with-the-Real-Time-Extension-lib.patch - fix-missing-sys-types-h.patch - v4lsink_back_compatible.patch - vss_build_failed.patch A new runtime dependency for libfslparser has been added. This is need to be available at rootfs but no code links to it explicitly so gst-fsl-plugin needs to made it explicit. The file, used in SRC_URI, is from 3.5.7-1.0.0 BSP but its contents explicitly say it is a 3.0.8 release so we use the source version to avoid supporting different version from different kernel releases. Change-Id: Id71d436af78dc62f620107d64633bf1ebbdaefef Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc4
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/Link-with-the-Real-Time-Extension-lib.patch47
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix-missing-sys-types-h.patch18
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch90
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch16
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb16
-rw-r--r--meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.8.bb15
7 files changed, 17 insertions, 189 deletions
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
index 2f25791ae..e74417269 100644
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
@@ -1,4 +1,4 @@
1# Copyright (C) 2011, 2012, 2013 Freescale Semiconductor 1# Copyright (C) 2011-2013 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4DESCRIPTION = "Gstreamer freescale plugins" 4DESCRIPTION = "Gstreamer freescale plugins"
@@ -45,7 +45,7 @@ PACKAGECONFIG[wmv9mpdec] +="--enable-wmv9mpdec,--disable-wmv9mpdec,${MSDEPENDS}"
45PACKAGECONFIG[wmv78dec] +="--enable-wmv78dec,--disable-wmv78dec,${MSDEPENDS}" 45PACKAGECONFIG[wmv78dec] +="--enable-wmv78dec,--disable-wmv78dec,${MSDEPENDS}"
46 46
47FILES_${PN} = "${libdir}/gstreamer-0.10/*.so ${datadir}" 47FILES_${PN} = "${libdir}/gstreamer-0.10/*.so ${datadir}"
48RDEPENDS_${PN} += "gst-plugins-good-id3demux" 48RDEPENDS_${PN} += "gst-plugins-good-id3demux libfslparser"
49 49
50FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" 50FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
51FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/pkgconfig/*.pc" 51FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/pkgconfig/*.pc"
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/Link-with-the-Real-Time-Extension-lib.patch b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/Link-with-the-Real-Time-Extension-lib.patch
deleted file mode 100644
index 86dc8b595..000000000
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/Link-with-the-Real-Time-Extension-lib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From f4f360d3858d3ac6a65ff754ada381f44827f0db Mon Sep 17 00:00:00 2001
2From: Leonardo Sandoval <leonardo_gdl@yahoo.com.mx>
3Date: Thu, 14 Feb 2013 23:37:09 -0600
4Subject: [PATCH] Link with the Real-Time Extension lib
5
6Upstream-Status: Pending
7
8Signed-off-by: Leonardo Sandoval <leonardo.sandoval@freescale.com>
9---
10 configure.ac | 5 +++++
11 src/misc/v4l_source/src/Makefile.am | 4 ++--
12 2 files changed, 7 insertions(+), 2 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 1ad4d22..f332d38 100755
16--- a/configure.ac
17+++ b/configure.ac
18@@ -173,6 +173,11 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou
19 AC_SUBST(IPU_CFLAGS)
20 AC_SUBST(IPU_LIBS)
21
22+dnl of the POSIX Real-Time Extensions.
23+AC_CHECK_LIB(rt, clock_gettime)
24+AC_SUBST(RT_CFLAGS)
25+AC_SUBST(RT_LIBS)
26+
27 FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null`
28 FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`
29 FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null`
30diff --git a/src/misc/v4l_source/src/Makefile.am b/src/misc/v4l_source/src/Makefile.am
31index b80d27e..490e441 100755
32--- a/src/misc/v4l_source/src/Makefile.am
33+++ b/src/misc/v4l_source/src/Makefile.am
34@@ -7,8 +7,8 @@ endif
35 plugin_LTLIBRARIES = libmfw_gst_v4lsrc.la
36
37 libmfw_gst_v4lsrc_la_SOURCES = mfw_gst_v4lsrc.c
38-libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta
39-libmfw_gst_v4lsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la
40+libmfw_gst_v4lsrc_la_CFLAGS = $(GST_BASE_CFLAGS) -fno-omit-frame-pointer $(IPU_CFLAGS) -D$(PLATFORM) -I$(FBHEADER_PATH) -I. -I../../../../inc/plugin -I../../../../libs/gstbufmeta $(RT_CFLAGS)
41+libmfw_gst_v4lsrc_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) ../../../../libs/libgstfsl-@GST_MAJORMINOR@.la $(RT_LIBS)
42 libmfw_gst_v4lsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
43
44 noinst_HEADERS = mfw_gst_v4lsrc.h
45--
461.7.5.4
47
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix-missing-sys-types-h.patch b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix-missing-sys-types-h.patch
deleted file mode 100644
index 939fc1434..000000000
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/fix-missing-sys-types-h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Fix a build failure due missing uint definiton
2
3Upstream-Status: Pending
4
5Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
6
7Index: gst-fsl-plugins-3.0.5/src/misc/v4l_sink/src/mfw_gst_fb.c
8===================================================================
9--- gst-fsl-plugins-3.0.5.orig/src/misc/v4l_sink/src/mfw_gst_fb.c
10+++ gst-fsl-plugins-3.0.5/src/misc/v4l_sink/src/mfw_gst_fb.c
11@@ -39,6 +39,7 @@
12
13 #include <fcntl.h>
14 #include <sys/ioctl.h>
15+#include <sys/types.h>
16 //#if ((!defined (_MX233)) && (!defined (_MX28)) && (!defined (_MX50)))
17 //#include <linux/mxcfb.h>
18 //#else
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch
deleted file mode 100644
index fecc01e77..000000000
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch
+++ /dev/null
@@ -1,90 +0,0 @@
1Make v4lsink backward compatible
2
3Upstream-Status: Pending
4
5diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
6index c9ec887..da2bac1 100644
7--- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
8+++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c
9@@ -310,6 +310,9 @@ mfw_gst_v4l2sink_query_support_formats ()
10
11 ret = TRUE;
12
13+ if(fmtdesc.index == 0)
14+ ret = FALSE;
15+
16 fail:
17 return ret;
18
19@@ -2170,19 +2173,60 @@ mfw_gst_v4lsink_base_init (gpointer g_class)
20 GstCaps *capslist;
21 GstPadTemplate *sink_template = NULL;
22
23- mfw_gst_v4l2sink_query_support_formats ();
24- /* make a list of all available caps */
25- capslist = gst_caps_new_empty ();
26+ if(!mfw_gst_v4l2sink_query_support_formats ()) {
27+ // failed query caps, use default setting
28+ gint i;
29+ guint32 formats[] = {
30+ GST_MAKE_FOURCC ('I', '4', '2', '0'),
31+ GST_MAKE_FOURCC ('Y', 'V', '1', '2'),
32+ GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'),
33+ GST_MAKE_FOURCC ('Y', 'U', 'Y', 'V'),
34+ GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'),
35+ GST_MAKE_FOURCC ('N', 'V', '1', '2'),
36+ GST_MAKE_FOURCC ('4', '2', '2', 'P'),
37+ GST_MAKE_FOURCC ('Y', '4', '2', 'B')
38
39- MfwV4lFmtMap * map = g_v4lfmt_maps;
40+ };
41
42- while (map->mime){
43- if (map->enable){
44- GstStructure * structure = gst_structure_from_string(map->mime, NULL);
45- gst_caps_append_structure (capslist, structure);
46- }
47- map++;
48- };
49+ /* make a list of all available caps */
50+ capslist = gst_caps_new_empty ();
51+ for (i = 0; i < G_N_ELEMENTS (formats); i++) {
52+ gst_caps_append_structure (capslist,
53+ gst_structure_new ("video/x-raw-yuv",
54+ "format",
55+ GST_TYPE_FOURCC,
56+ formats[i], "width",
57+ GST_TYPE_INT_RANGE, 1,
58+ G_MAXINT, "height",
59+ GST_TYPE_INT_RANGE, 1,
60+ G_MAXINT, "framerate",
61+ GST_TYPE_FRACTION_RANGE,
62+ 0, 1, G_MAXINT, 1,
63+ NULL));
64+ }
65+ /* Add RGB support */
66+ gst_caps_append_structure (capslist,
67+ gst_structure_new ("video/x-raw-rgb",
68+ "bpp", GST_TYPE_INT_RANGE,
69+ 1, 32, "depth",
70+ GST_TYPE_INT_RANGE, 1, 32,
71+ NULL));
72+
73+ }
74+ else {
75+ /* make a list of all available caps */
76+ capslist = gst_caps_new_empty ();
77+
78+ MfwV4lFmtMap * map = g_v4lfmt_maps;
79+
80+ while (map->mime){
81+ if (map->enable){
82+ GstStructure * structure = gst_structure_from_string(map->mime, NULL);
83+ gst_caps_append_structure (capslist, structure);
84+ }
85+ map++;
86+ };
87+ }
88
89 sink_template = gst_pad_template_new ("sink",
90 GST_PAD_SINK, GST_PAD_ALWAYS, capslist);
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch
deleted file mode 100644
index c0592343a..000000000
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1diff --git a/libs/Makefile.am b/libs/Makefile.am
2index e9d3d54..89f79be 100755
3--- a/libs/Makefile.am
4+++ b/libs/Makefile.am
5@@ -36,6 +36,11 @@ endif
6
7
8 libgstfsl_@GST_MAJORMINOR@_la_CFLAGS = $(GST_BASE_CFLAGS) $(IPU_CFLAGS) -I../inc/common
9+
10+if PLATFORM_IS_MX5X
11+libgstfsl_@GST_MAJORMINOR@_la_CFLAGS += -DIPULIB
12+endif
13+
14 libgstfsl_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@
15 libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS)
16
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb
deleted file mode 100644
index 097b8cbd8..000000000
--- a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1# Copyright (C) 2012-2013 Freescale Semicondutor
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4require gst-fsl-plugin.inc
5
6SRC_URI[md5sum] = "08be9263c609b90e3b3e2e3aa888cd29"
7SRC_URI[sha256sum] = "f3cd4a51d1eb60c21219d8d94daa832e47fc51d8f4618bb79cdf36bcca0a0f7c"
8
9SRC_URI_append += "file://fix-missing-sys-types-h.patch \
10 file://Link-with-the-Real-Time-Extension-lib.patch \
11 file://vss_build_failed.patch \
12 file://configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch \
13 file://v4lsink_back_compatible.patch \
14 "
15
16COMPATIBLE_MACHINE = "(mx28|mx5|mx6)"
diff --git a/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.8.bb b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.8.bb
new file mode 100644
index 000000000..ea0d26e35
--- /dev/null
+++ b/meta-fsl-arm/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.8.bb
@@ -0,0 +1,15 @@
1# Copyright (C) 2012-2013 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4require gst-fsl-plugin.inc
5
6SRC_URI[md5sum] = "fe298c831e107ae5b93df05c4c29bb65"
7SRC_URI[sha256sum] = "6c3215f24dedabf97ad6a7bd5c8d088b01dc4cd4792c56e0df353ae03adb35ff"
8
9# FIXME: Inspecting the source code the content is in fact 3.0.8
10SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-3.5.7-1.0.0.tar.gz"
11S = "${WORKDIR}/gst-fsl-plugins-3.5.7-1.0.0"
12
13SRC_URI_append += "file://configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch"
14
15COMPATIBLE_MACHINE = "(mx28|mx5|mx6)"