summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-01-28 17:33:50 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2021-02-01 11:24:43 -0300
commit4c3640d0bcaf373e960e0c529af13db63f73debf (patch)
tree88ea93e70bca31499faedee985359135cd68e093
parent04f9cfd2cef7ec536c2f986283715a9cef09b207 (diff)
downloadmeta-freescale-4c3640d0bcaf373e960e0c529af13db63f73debf.tar.gz
imx-gst1.0-plugin: update to 4.5.7
NXP release imx_5.4.70_2.3.0. 0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch dropped, fixed upstream in commit 0d6c21be9a44720c43ac5ac1fb0c0684b3673248. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch34
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb (renamed from recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb)7
2 files changed, 3 insertions, 38 deletions
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch
deleted file mode 100644
index 9a0afea5..00000000
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From eb89cd344535706c6194359bd1f1fed50162a041 Mon Sep 17 00:00:00 2001
2From: Andrey Zhizhikin <andrey.z@gmail.com>
3Date: Tue, 1 Sep 2020 08:24:52 +0000
4Subject: [PATCH] fsl_parser.h: fix compiler error with -fcommon
5
6When -fcommon is set in GCC10 configuration, following error is produced
7during linking:
8./git/ext-includes/fsl_parser.h:598: multiple definition of `TrackExtTagIndex';
9./git/ext-includes/fsl_parser.h:598: first defined here
10
11Remove unused enum name to resolve multiple definitions, it is not used
12anywhere in the code base.
13
14Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
15---
16 ext-includes/fsl_parser.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/ext-includes/fsl_parser.h b/ext-includes/fsl_parser.h
20index d3aae20..c037c9a 100755
21--- a/ext-includes/fsl_parser.h
22+++ b/ext-includes/fsl_parser.h
23@@ -595,7 +595,7 @@ enum{
24 FSL_PARSER_TRACKEXTTAG_CRYPTO_ENCRYPTED_BYTE_BLOCK,
25 FSL_PARSER_TRACKEXTTAG_CRYPTO_SKIP_BYTE_BLOCK,
26 FSL_PARSER_TRACKEXTTAG_CRYPTO_IV,
27-}TrackExtTagIndex;
28+};
29
30 typedef struct _SeiPosition
31 {
32--
332.17.1
34
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb
index d2881656..c8bb6cd8 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb
@@ -1,5 +1,5 @@
1# Copyright (C) 2014,2016 Freescale Semiconductor 1# Copyright (C) 2014,2016 Freescale Semiconductor
2# Copyright 2017-2018 NXP 2# Copyright 2017-2019 NXP
3# Copyright (C) 2012-2015 O.S. Systems Software LTDA. 3# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
4# Released under the MIT license (see COPYING.MIT for the terms) 4# Released under the MIT license (see COPYING.MIT for the terms)
5 5
@@ -20,13 +20,12 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin"
20LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ 20LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
21 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" 21 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
22 22
23SRCBRANCH = "MM_04.05.06_2008_L5.4.47" 23SRCBRANCH = "MM_04.05.07_2011_L5.4.70"
24 24
25SRC_URI = " \ 25SRC_URI = " \
26 git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ 26 git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \
27 file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \
28" 27"
29SRCREV = "a4373418f5884de7d2da63581d3905f0e3a5d842" 28SRCREV = "659ec4947d6b1903d26e4ec9e40ae251a659935d"
30 29
31S = "${WORKDIR}/git" 30S = "${WORKDIR}/git"
32 31