summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiane Angolini <daiane.angolini@freescale.com>2013-05-16 12:33:33 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-05-28 11:00:50 -0300
commit21829aed82cd4db5207667ca3484f5a79e2124a1 (patch)
tree753e98941a605bfde515395edbefd2bcf21559b0
parent1af4fa9662dc9bb504717c379c279af1c7e3a9f6 (diff)
downloadmeta-fsl-arm-21829aed82cd4db5207667ca3484f5a79e2124a1.tar.gz
gst-fsl-plugin: Update to version 3.0.7
The 3.0.7 version is compatible with MX28, MX53 and MX6 SoCs so we move them all to this release. Change-Id: I3ebf1c4ad6d02e2886450bc9c3dcfb1df98b6160 Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin.inc14
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin/configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch58
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch90
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch16
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb17
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.5.bb19
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.6.bb19
-rw-r--r--recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb16
8 files changed, 187 insertions, 62 deletions
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc b/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
index 04f02b0..264beb2 100644
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin.inc
@@ -1,21 +1,21 @@
1# Copyright (C) 2011, 2012 Freescale Semiconductor 1# Copyright (C) 2011, 2012, 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"
5LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1" 5LICENSE = "GPLv2 & LGPLv2 & LGPLv2.1"
6SECTION = "multimedia" 6SECTION = "multimedia"
7DEPENDS = "gstreamer gst-plugins-base imx-lib" 7
8INC_PR = "r9" 8DEPENDS = "gstreamer gst-plugins-base libfslcodec libfslparser"
9DEPENDS_append_mx5 = " imx-lib"
10DEPENDS_append_mx6 = " imx-lib libfslvpuwrap"
9 11
10LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
11 file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ 13 file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
12 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" 14 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
13 15
14PACKAGE_NAME ?= "${PN}" 16S = "${WORKDIR}/gst-fsl-plugins-${PV}"
15
16S = "${WORKDIR}/${PACKAGE_NAME}-${PV}"
17 17
18SRC_URI = "${FSL_MIRROR}/${PACKAGE_NAME}-${PV}.tar.gz" 18SRC_URI = "${FSL_MIRROR}/gst-fsl-plugins-${PV}.tar.gz"
19 19
20inherit autotools pkgconfig 20inherit autotools pkgconfig
21 21
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin/configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch b/recipes-multimedia/gst-plugins/gst-fsl-plugin/configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch
new file mode 100644
index 0000000..cab9ff4
--- /dev/null
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin/configure.ac-Use-pkg-config-sysroot-when-checking-fo.patch
@@ -0,0 +1,58 @@
1From 6f75a9f4ad108c1f4a3dff4dd08def174ab83a69 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Tue, 21 May 2013 16:43:31 -0300
4Subject: [PATCH] configure.ac: Use pkg-config sysroot when checking for soname
5
6Upstream-Status: Pending
7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9---
10 configure.ac | 12 +++++-------
11 1 file changed, 5 insertions(+), 7 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index e4cdb86..c12ceb4 100755
15--- a/configure.ac
16+++ b/configure.ac
17@@ -16,7 +16,7 @@ AC_DEFUN([FIND_PARSER_SONAME],
18 [
19 AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname])
20 path=`$PKG_CONFIG --variable=libdir libfslparser`
21- SONAME=$( $CC -print-file-name=$path/lib_$1_parser_$2_elinux.so | \
22+ SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \
23 while read output; do objdump -p $output | \
24 grep "SONAME" | \
25 sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
26@@ -27,16 +27,15 @@ AC_DEFUN([FIND_PARSER_SONAME],
27 else
28 AC_MSG_RESULT([$SONAME])
29 fi
30- apath=`echo $path | sed -e 's|.*/imx-mm/|/usr/lib/imx-mm/|'`
31- $1_$2_SONAME=$apath/$SONAME
32+ $1_$2_SONAME=$path/$SONAME
33 AC_SUBST($1_$2_SONAME)
34 ])
35
36 AC_DEFUN([FIND_ACODEC_SONAME],
37 [
38 AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname])
39- path=`$PKG_CONFIG --variable=libdir libfslaudiocodec | sed -e 's|.*/imx-mm/|/usr/lib/imx-mm/|'`
40- SONAME=$( $CC -print-file-name=$path/wrap/lib_$1_wrap_$2_elinux.so | \
41+ path=`$PKG_CONFIG --variable=libdir libfslaudiocodec`
42+ SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \
43 while read output; do objdump -p $output | \
44 grep "SONAME" | \
45 sed -e 's/ \+SONAME \+//'; done 2> /dev/null )
46@@ -48,8 +47,7 @@ AC_DEFUN([FIND_ACODEC_SONAME],
47 AC_MSG_RESULT([$SONAME])
48 fi
49
50- apath=`echo $path | sed -e 's|.*/imx-mm/|/usr/lib/imx-mm/|'`
51- $1_$2_SONAME=$apath/wrap/$SONAME
52+ $1_$2_SONAME=$path/wrap/$SONAME
53 AC_SUBST($1_$2_SONAME)
54 ])
55
56--
571.8.1
58
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch b/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch
new file mode 100644
index 0000000..fecc01e
--- /dev/null
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin/v4lsink_back_compatible.patch
@@ -0,0 +1,90 @@
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/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch b/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch
new file mode 100644
index 0000000..c059234
--- /dev/null
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin/vss_build_failed.patch
@@ -0,0 +1,16 @@
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/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb b/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
deleted file mode 100644
index f16e6c6..0000000
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin_2.0.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1# Copyright (C) 2011, 2012 Freescale Semicondutor
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4require gst-fsl-plugin.inc
5DEPENDS += "fsl-mm-codeclib fsl-mm-flv-codeclib fsl-mm-mp3enc-codeclib"
6RDEPENDS_${PN} = "fsl-mm-codeclib fsl-mm-flv-codeclib fsl-mm-mp3enc-codeclib"
7
8PR = "${INC_PR}.5"
9
10SRC_URI += "file://fix_segment_fault_in_v4lsink_for_yocto.patch \
11 file://fix-missing-sys-types-h.patch \
12 file://Use-librarys-SONAME-in-dlopen.patch"
13
14SRC_URI[md5sum] = "036a8e86031b0670f41b10796e268f9e"
15SRC_URI[sha256sum] = "ee024e6fe94ce309b10dc89ab247d1bbcf8ae9cc8006178c96101ce2d4d164a0"
16
17COMPATIBLE_MACHINE = "(mx5)"
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.5.bb b/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.5.bb
deleted file mode 100644
index 36fbe41..0000000
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.5.bb
+++ /dev/null
@@ -1,19 +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
6DEPENDS += "libfslcodec libfslvpuwrap libfslparser"
7
8PR = "${INC_PR}.3"
9
10SRC_URI += "file://fix-missing-sys-types-h.patch \
11 file://Link-with-the-Real-Time-Extension-lib.patch \
12 "
13
14PACKAGE_NAME = "gst-fsl-plugins"
15
16SRC_URI[md5sum] = "fd7c9db129cbcc4dc79b7dd832061594"
17SRC_URI[sha256sum] = "546deb407993f726ef4e140f5bd734d612d5f8872c832ac820957f667f22306e"
18
19COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.6.bb b/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.6.bb
deleted file mode 100644
index 77baa9a..0000000
--- a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.6.bb
+++ /dev/null
@@ -1,19 +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
6DEPENDS = "virtual/kernel gstreamer gst-plugins-base libfslcodec libfslparser"
7
8PR = "${INC_PR}.1"
9
10SRC_URI += "file://fix-missing-sys-types-h.patch \
11 file://Link-with-the-Real-Time-Extension-lib.patch \
12 "
13
14PACKAGE_NAME = "gst-fsl-plugins"
15
16SRC_URI[md5sum] = "5416a727e8b0bd94eec077ac7d70aae7"
17SRC_URI[sha256sum] = "fdb0b5ab964f607a93664412702a131931da8ef0b557597cbf161c3d9c9d0c12"
18
19COMPATIBLE_MACHINE = "(mx28)"
diff --git a/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb b/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb
new file mode 100644
index 0000000..097b8cb
--- /dev/null
+++ b/recipes-multimedia/gst-plugins/gst-fsl-plugin_3.0.7.bb
@@ -0,0 +1,16 @@
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)"