summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2023-01-09 19:42:13 -0700
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-11 11:35:46 +0000
commit3fda6384f8e773db8b83fa027f0049bb91bb0cad (patch)
treefd7e5403660892ec992b980974c2df736928fe4e
parent27cbd13ca5a36f68e305f3f13c125064b8ff07bd (diff)
downloadmeta-freescale-3fda6384f8e773db8b83fa027f0049bb91bb0cad.tar.gz
gstreamer: Upgrade 1.20.0.imx -> 1.20.3.imx
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> (cherry picked from commit 29f156cc8ccc518eb520699749be09ec1892c765)
-rw-r--r--conf/machine/include/imx-base.inc8
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb)4
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb)4
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb)4
-rw-r--r--recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb)4
-rw-r--r--recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb (renamed from recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.1.bb)8
6 files changed, 18 insertions, 14 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 426d66a8..04ad558d 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -450,10 +450,10 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm-nxp-bsp ?= "imx-gst1.0-plugin"
450MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" 450MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin"
451MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" 451MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin"
452 452
453PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.0.imx" 453PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.3.imx"
454PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.0.imx" 454PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.3.imx"
455PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.0.imx" 455PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.3.imx"
456PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.0.imx" 456PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.3.imx"
457PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" 457PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1"
458 458
459# Determines if the SoC has support for Vivante kernel driver 459# Determines if the SoC has support for Vivante kernel driver
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb
index 31ddfa36..2dfe80b5 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb
@@ -185,8 +185,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug
185 " 185 "
186SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " 186SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
187GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" 187GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
188SRCBRANCH = "MM_04.07.01_2208_L5.15.y" 188SRCBRANCH = "MM_04.07.02_2210_L5.15.y"
189SRCREV = "a9c9d17bb3fc94f49f9c17fd965090949b7ba1cd" 189SRCREV = "cfb43ae30f9038a004ea1b916c74bc66f33e1171"
190 190
191S = "${WORKDIR}/git" 191S = "${WORKDIR}/git"
192 192
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb
index e2f090d2..d365699f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb
@@ -114,8 +114,8 @@ SRC_URI:remove = " \
114SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " 114SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
115SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" 115SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch"
116GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" 116GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
117SRCBRANCH = "MM_04.07.01_2208_L5.15.y" 117SRCBRANCH = "MM_04.07.02_2210_L5.15.y"
118SRCREV = "db100facd1b3601c225bfac2fae7abc9f7a5f92c" 118SRCREV = "cbf542ce3e0bad1009d5ecf72707e870c375c3f0"
119 119
120S = "${WORKDIR}/git" 120S = "${WORKDIR}/git"
121 121
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb
index 4b38fda2..8cbbd2d1 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb
@@ -100,8 +100,8 @@ DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', '
100SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" 100SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz"
101SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " 101SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
102GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" 102GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
103SRCBRANCH = "MM_04.07.01_2208_L5.15.y" 103SRCBRANCH = "MM_04.07.02_2210_L5.15.y"
104SRCREV = "b83d1e4a3cd702bbe0cf4544aa2acc55796e4a0f" 104SRCREV = "643478677a4acb225dbb48e64720b06a7c6da668"
105 105
106S = "${WORKDIR}/git" 106S = "${WORKDIR}/git"
107 107
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb
index 464b8ce0..2c419601 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.0.imx.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb
@@ -89,8 +89,8 @@ DEFAULT_PREFERENCE = "-1"
89SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" 89SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz"
90SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " 90SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
91GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" 91GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
92SRCBRANCH = "MM_04.07.01_2208_L5.15.y" 92SRCBRANCH = "MM_04.07.02_2210_L5.15.y"
93SRCREV = "7afc123bc6974d68795f97466eb83ec7a093fb9b" 93SRCREV = "6d2a525316b3f5cbda6a87fc5b213ab03055f320"
94 94
95S = "${WORKDIR}/git" 95S = "${WORKDIR}/git"
96 96
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.1.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
index d174b70c..cdd5d848 100644
--- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.7.1.bb
+++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb
@@ -11,6 +11,7 @@ DEPENDS = "imx-codec imx-parser gstreamer1.0 gstreamer1.0-plugins-base gstreamer
11DEPENDS:append:mx6-nxp-bsp = " imx-lib" 11DEPENDS:append:mx6-nxp-bsp = " imx-lib"
12DEPENDS:append:mx7-nxp-bsp = " imx-lib" 12DEPENDS:append:mx7-nxp-bsp = " imx-lib"
13DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" 13DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib"
14DEPENDS:append:mx9-nxp-bsp = " imx-lib"
14DEPENDS:append:imxvpu = " imx-vpuwrap" 15DEPENDS:append:imxvpu = " imx-vpuwrap"
15DEPENDS:append:imxfbdev:imxgpu = " libdrm" 16DEPENDS:append:imxfbdev:imxgpu = " libdrm"
16 17
@@ -22,9 +23,11 @@ RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
22LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ 23LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
23 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" 24 file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
24 25
26PV = "4.7.2+git${SRCPV}"
27
25SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" 28SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
26SRCBRANCH = "MM_04.07.01_2208_L5.15.y" 29SRCBRANCH = "MM_04.07.02_2210_L5.15.y"
27SRCREV = "f4410b70e8cb49ec0d522bb0681c5d9178cfc216" 30SRCREV = "3a0250b983f2610e6936d10c63b45e2d39eadd7e"
28 31
29S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"
30 33
@@ -38,6 +41,7 @@ PLATFORM:mx6sll-nxp-bsp = "MX6SLL"
38PLATFORM:mx7-nxp-bsp= "MX7D" 41PLATFORM:mx7-nxp-bsp= "MX7D"
39PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" 42PLATFORM:mx7ulp-nxp-bsp= "MX7ULP"
40PLATFORM:mx8-nxp-bsp = "MX8" 43PLATFORM:mx8-nxp-bsp = "MX8"
44PLATFORM:mx9-nxp-bsp = "MX9"
41 45
42# Todo add a mechanism to map possible build targets 46# Todo add a mechanism to map possible build targets
43EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ 47EXTRA_OEMESON = "-Dplatform=${PLATFORM} \