diff options
-rw-r--r-- | conf/machine/include/imx-base.inc | 8 | ||||
-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 718f6b30..fa614be7 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" | |||
450 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" | 450 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp-nxp-bsp ?= "imx-gst1.0-plugin" |
451 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" | 451 | MACHINE_GSTREAMER_1_0_PLUGIN:mx8dx-nxp-bsp ?= "imx-gst1.0-plugin" |
452 | 452 | ||
453 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.0.imx" | 453 | PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp ??= "1.20.3.imx" |
454 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.0.imx" | 454 | PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.20.3.imx" |
455 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.0.imx" | 455 | PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.20.3.imx" |
456 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.0.imx" | 456 | PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp ??= "1.20.3.imx" |
457 | PREFERRED_VERSION_ffmpeg:mx8-nxp-bsp ??= "4.4.1" | 457 | PREFERRED_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 | " |
186 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 186 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
187 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" | 187 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
188 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 188 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" |
189 | SRCREV = "a9c9d17bb3fc94f49f9c17fd965090949b7ba1cd" | 189 | SRCREV = "cfb43ae30f9038a004ea1b916c74bc66f33e1171" |
190 | 190 | ||
191 | S = "${WORKDIR}/git" | 191 | S = "${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 = " \ | |||
114 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 114 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
115 | SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" | 115 | SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" |
116 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 116 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
117 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 117 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" |
118 | SRCREV = "db100facd1b3601c225bfac2fae7abc9f7a5f92c" | 118 | SRCREV = "cbf542ce3e0bad1009d5ecf72707e870c375c3f0" |
119 | 119 | ||
120 | S = "${WORKDIR}/git" | 120 | S = "${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', '', ' | |||
100 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" | 100 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" |
101 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 101 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
102 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 102 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
103 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 103 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" |
104 | SRCREV = "b83d1e4a3cd702bbe0cf4544aa2acc55796e4a0f" | 104 | SRCREV = "643478677a4acb225dbb48e64720b06a7c6da668" |
105 | 105 | ||
106 | S = "${WORKDIR}/git" | 106 | S = "${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" | |||
89 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 89 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" |
90 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 90 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
91 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 91 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
92 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 92 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" |
93 | SRCREV = "7afc123bc6974d68795f97466eb83ec7a093fb9b" | 93 | SRCREV = "6d2a525316b3f5cbda6a87fc5b213ab03055f320" |
94 | 94 | ||
95 | S = "${WORKDIR}/git" | 95 | S = "${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 | |||
11 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" | 11 | DEPENDS:append:mx6-nxp-bsp = " imx-lib" |
12 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" | 12 | DEPENDS:append:mx7-nxp-bsp = " imx-lib" |
13 | DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" | 13 | DEPENDS:append:mx8ulp-nxp-bsp = " imx-lib" |
14 | DEPENDS:append:mx9-nxp-bsp = " imx-lib" | ||
14 | DEPENDS:append:imxvpu = " imx-vpuwrap" | 15 | DEPENDS:append:imxvpu = " imx-vpuwrap" |
15 | DEPENDS:append:imxfbdev:imxgpu = " libdrm" | 16 | DEPENDS:append:imxfbdev:imxgpu = " libdrm" |
16 | 17 | ||
@@ -22,9 +23,11 @@ RCONFLICTS:${PN} = "gst1.0-fsl-plugin" | |||
22 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | 23 | LIC_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 | ||
26 | PV = "4.7.2+git${SRCPV}" | ||
27 | |||
25 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" | 28 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" |
26 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 29 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" |
27 | SRCREV = "f4410b70e8cb49ec0d522bb0681c5d9178cfc216" | 30 | SRCREV = "3a0250b983f2610e6936d10c63b45e2d39eadd7e" |
28 | 31 | ||
29 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
30 | 33 | ||
@@ -38,6 +41,7 @@ PLATFORM:mx6sll-nxp-bsp = "MX6SLL" | |||
38 | PLATFORM:mx7-nxp-bsp= "MX7D" | 41 | PLATFORM:mx7-nxp-bsp= "MX7D" |
39 | PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" | 42 | PLATFORM:mx7ulp-nxp-bsp= "MX7ULP" |
40 | PLATFORM:mx8-nxp-bsp = "MX8" | 43 | PLATFORM:mx8-nxp-bsp = "MX8" |
44 | PLATFORM: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 |
43 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ | 47 | EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ |