diff options
author | Yuqing Zhu <carol.zhu@nxp.com> | 2019-05-13 10:48:09 +0800 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-05-17 07:50:56 -0300 |
commit | 08f16dfd52eafe5813abe7dea3ff1f76935ab954 (patch) | |
tree | 4ac031e77699a0b0ba8448c6fe69249eb5318127 | |
parent | fdfb1222ac30ff2ee67c88e7139f3f2ae0af42b3 (diff) | |
download | meta-freescale-08f16dfd52eafe5813abe7dea3ff1f76935ab954.tar.gz |
gstreamer1.0-plugins-base: Switch to MM_04.04.05_1902_L4.14.98_GA branch
-Enable eac3 pass-through mode
-Glcolorbalance: fix pipeline crash when init
-Glupload: add internal physical buffer pool
-Video-frame: correct copy width when format is NV12_10LE
-Update 0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
to fix applying conflict.
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
2 files changed, 14 insertions, 18 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index a1cc7d3d..bcada34c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | |||
@@ -1,14 +1,13 @@ | |||
1 | From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001 | 1 | From 7022b87353a37b78bae7cf0106a4e47913bb5c97 Mon Sep 17 00:00:00 2001 |
2 | From: Yuqing Zhu <carol.zhu@nxp.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 20 Apr 2018 22:46:46 +0800 | 3 | Date: Thu, 5 Apr 2018 10:15:08 +0800 |
4 | Subject: [PATCH] Makefile.am: don't hardcode libtool name when running | 4 | Subject: [PATCH] Makefile.am: don't hardcode libtool name when running |
5 | introspection tools | 5 | introspection tools |
6 | 6 | ||
7 | Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0 | ||
8 | |||
9 | Upstream-Status: Pending [review on oe-core maillist] | 7 | Upstream-Status: Pending [review on oe-core maillist] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | 10 | ||
11 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | ||
12 | --- | 11 | --- |
13 | gst-libs/gst/allocators/Makefile.am | 2 +- | 12 | gst-libs/gst/allocators/Makefile.am | 2 +- |
14 | gst-libs/gst/app/Makefile.am | 2 +- | 13 | gst-libs/gst/app/Makefile.am | 2 +- |
@@ -24,10 +23,10 @@ Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | |||
24 | 11 files changed, 11 insertions(+), 11 deletions(-) | 23 | 11 files changed, 11 insertions(+), 11 deletions(-) |
25 | 24 | ||
26 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | 25 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am |
27 | index 0edc0ae..d0d425d 100644 | 26 | index 1957d28..1ecc950 100644 |
28 | --- a/gst-libs/gst/allocators/Makefile.am | 27 | --- a/gst-libs/gst/allocators/Makefile.am |
29 | +++ b/gst-libs/gst/allocators/Makefile.am | 28 | +++ b/gst-libs/gst/allocators/Makefile.am |
30 | @@ -58,7 +58,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | 29 | @@ -42,7 +42,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ |
31 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 30 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
32 | --library=libgstallocators-@GST_API_VERSION@.la \ | 31 | --library=libgstallocators-@GST_API_VERSION@.la \ |
33 | --include=Gst-@GST_API_VERSION@ \ | 32 | --include=Gst-@GST_API_VERSION@ \ |
@@ -63,14 +62,14 @@ index 2922245..7fb65f2 100644 | |||
63 | --pkg gstreamer-base-@GST_API_VERSION@ \ | 62 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
64 | --pkg-export gstreamer-audio-@GST_API_VERSION@ \ | 63 | --pkg-export gstreamer-audio-@GST_API_VERSION@ \ |
65 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | 64 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am |
66 | index b04187f..576bf1c 100644 | 65 | index 4e77e8c..3276d7f 100644 |
67 | --- a/gst-libs/gst/gl/Makefile.am | 66 | --- a/gst-libs/gst/gl/Makefile.am |
68 | +++ b/gst-libs/gst/gl/Makefile.am | 67 | +++ b/gst-libs/gst/gl/Makefile.am |
69 | @@ -205,7 +205,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ | 68 | @@ -193,7 +193,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ |
70 | --include=Gst-@GST_API_VERSION@ \ | 69 | --include=Gst-@GST_API_VERSION@ \ |
71 | --include=GstBase-@GST_API_VERSION@ \ | 70 | --include=GstBase-@GST_API_VERSION@ \ |
72 | --include=GstVideo-@GST_API_VERSION@ \ | 71 | --include=GstVideo-@GST_API_VERSION@ \ |
73 | - --libtool="$(top_builddir)/libtool" \ | 72 | - --libtool="${LIBTOOL}" \ |
74 | + --libtool="$(LIBTOOL)" \ | 73 | + --libtool="$(LIBTOOL)" \ |
75 | --pkg gstreamer-@GST_API_VERSION@ \ | 74 | --pkg gstreamer-@GST_API_VERSION@ \ |
76 | --pkg gstreamer-base-@GST_API_VERSION@ \ | 75 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
@@ -154,10 +153,10 @@ index 0247c33..c86515b 100644 | |||
154 | --pkg gstreamer-base-@GST_API_VERSION@ \ | 153 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
155 | --pkg-export gstreamer-tag-@GST_API_VERSION@ \ | 154 | --pkg-export gstreamer-tag-@GST_API_VERSION@ \ |
156 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | 155 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am |
157 | index 1b74f37..0f7c07e 100644 | 156 | index 9fc1ccf..0f8455f 100644 |
158 | --- a/gst-libs/gst/video/Makefile.am | 157 | --- a/gst-libs/gst/video/Makefile.am |
159 | +++ b/gst-libs/gst/video/Makefile.am | 158 | +++ b/gst-libs/gst/video/Makefile.am |
160 | @@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | 159 | @@ -124,7 +124,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE |
161 | --library=libgstvideo-@GST_API_VERSION@.la \ | 160 | --library=libgstvideo-@GST_API_VERSION@.la \ |
162 | --include=Gst-@GST_API_VERSION@ \ | 161 | --include=Gst-@GST_API_VERSION@ \ |
163 | --include=GstBase-@GST_API_VERSION@ \ | 162 | --include=GstBase-@GST_API_VERSION@ \ |
@@ -166,6 +165,3 @@ index 1b74f37..0f7c07e 100644 | |||
166 | --pkg gstreamer-@GST_API_VERSION@ \ | 165 | --pkg gstreamer-@GST_API_VERSION@ \ |
167 | --pkg gstreamer-base-@GST_API_VERSION@ \ | 166 | --pkg gstreamer-base-@GST_API_VERSION@ \ |
168 | --pkg-export gstreamer-video-@GST_API_VERSION@ \ | 167 | --pkg-export gstreamer-video-@GST_API_VERSION@ \ |
169 | -- | ||
170 | 2.7.4 | ||
171 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index 0da9a2ea..d329dbac 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ | |||
8 | DEPENDS += "iso-codes util-linux" | 8 | DEPENDS += "iso-codes util-linux" |
9 | 9 | ||
10 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" | 10 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" |
11 | SRCBRANCH = "MM_04.04.02_1808_L4.9.123_MX8MM_GA" | 11 | SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" |
12 | 12 | ||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ | 14 | ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ |
@@ -19,7 +19,7 @@ SRC_URI = " \ | |||
19 | file://0003-riff-add-missing-include-directories-when-calling-in.patch \ | 19 | file://0003-riff-add-missing-include-directories-when-calling-in.patch \ |
20 | file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ | 20 | file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ |
21 | " | 21 | " |
22 | SRCREV = "e1f90437939b147658efed4d86c3f99d5e606968" | 22 | SRCREV = "f62f8ab685e549eefaecdb1e700239a5a408fcad" |
23 | 23 | ||
24 | DEFAULT_PREFERENCE = "-1" | 24 | DEFAULT_PREFERENCE = "-1" |
25 | 25 | ||