diff options
author | Hiago De Franco <hiago.franco@toradex.com> | 2024-10-27 11:27:36 -0300 |
---|---|---|
committer | Hiago De Franco <hiago.franco@toradex.com> | 2024-10-27 11:38:41 -0300 |
commit | 16907876d76c5ac499cb6c174968886940d6042b (patch) | |
tree | 7e49583ef4fbbc3f14693b81016e559f32e45187 | |
parent | ac4e9df365340ae7fd1534446a26a673fef15252 (diff) | |
download | meta-freescale-16907876d76c5ac499cb6c174968886940d6042b.tar.gz |
recipes-multimedia: gstreamer: Upgrade BSP to LF6.6.36_2.1.0
Upgrade the following recipes to the new NXP BSP LF6.6.36_2.1.0:
- gstreamer1.0
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-good
- imx-gst1.0-plugin
In addition, remove patch for imx-gst1.0-plugin since it is not needed
anymore (see [1]).
[1] https://github.com/nxp-imx/imx-gst1.0-plugin/commit/74a6afa6cceb69fe4b8cf09690392093cc7c5b37
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
6 files changed, 12 insertions, 48 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb index c53025b75..f6d094f55 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb | |||
@@ -190,8 +190,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug | |||
190 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 190 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " |
191 | SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch" | 191 | SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch" |
192 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" | 192 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
193 | SRCBRANCH = "MM_04.09.00_2405_L6.6.y" | 193 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" |
194 | SRCREV = "869cef4efbc004c795392d274e617f2dfa71ac98" | 194 | SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd" |
195 | 195 | ||
196 | S = "${WORKDIR}/git" | 196 | S = "${WORKDIR}/git" |
197 | 197 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb index 348a30dc5..6e7bc20eb 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb | |||
@@ -118,8 +118,8 @@ SRC_URI:remove = " \ | |||
118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 118 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
119 | 119 | ||
120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 120 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
121 | SRCBRANCH = "MM_04.09.00_2405_L6.6.y" | 121 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" |
122 | SRCREV = "1c9913d7ce81c43cbf756158a35f61dbeee19ea3" | 122 | SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7" |
123 | 123 | ||
124 | S = "${WORKDIR}/git" | 124 | S = "${WORKDIR}/git" |
125 | 125 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb index 5d5a2425c..67dc139fa 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb | |||
@@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu | |||
111 | 111 | ||
112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 112 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 113 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
114 | SRCBRANCH = "MM_04.09.00_2405_L6.6.y" | 114 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" |
115 | SRCREV = "50535da48c564bd3a46b2e39e0a3a97cf7e86df3" | 115 | SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af" |
116 | 116 | ||
117 | # set 32bit compile timer for 32-bit platform | 117 | # set 32bit compile timer for 32-bit platform |
118 | GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" | 118 | GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = "" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb index 33b3c65c1..43cb6a4a2 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.24.0.imx.bb | |||
@@ -95,8 +95,8 @@ LIC_FILES_CHKSUM = " \ | |||
95 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 95 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" |
96 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 96 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
97 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 97 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
98 | SRCBRANCH = "MM_04.09.00_2405_L6.6.y" | 98 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" |
99 | SRCREV = "753c7b4471d14befd1b7c9cd3fa9af9f10ab4a08" | 99 | SRCREV = "eb286c0766a4fbbae70c8e9dda074f5a90e52e42" |
100 | 100 | ||
101 | S = "${WORKDIR}/git" | 101 | S = "${WORKDIR}/git" |
102 | 102 | ||
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch b/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch deleted file mode 100644 index 5a58a5a67..000000000 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From bda3461b0b6493f3e04910e82e6e530a64af26b1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tom Hochstein <tom.hochstein@nxp.com> | ||
3 | Date: Mon, 24 Jul 2023 12:09:34 -0700 | ||
4 | Subject: [PATCH] meson: Undef _TIME_BITS along with _FILE_OFFSET_BITS | ||
5 | |||
6 | On gcc 13, _TIME_BITS is set to 64 and causes failure with the undef of | ||
7 | _FILE_OFFSET_BITS: | ||
8 | ``` | ||
9 | /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ||
10 | 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ||
11 | | ^~~~~ | ||
12 | ``` | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> | ||
16 | --- | ||
17 | meson.build | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/meson.build b/meson.build | ||
21 | index 7ec5c70..64b2930 100644 | ||
22 | --- a/meson.build | ||
23 | +++ b/meson.build | ||
24 | @@ -24,6 +24,7 @@ gst_dep = dependency('gstreamer-' + api_version, version : gst_req) | ||
25 | #meson automaticaly add _FILE_OFFSET_BITS=64 to gcc, this will make ipu test | ||
26 | #case fail when do mmap on 6q, autoconf didn't add this define, so undef it | ||
27 | add_project_arguments('-U_FILE_OFFSET_BITS', language: 'c') | ||
28 | +add_project_arguments('-U_TIME_BITS', language: 'c') | ||
29 | |||
30 | #below two marcos are defined in autoconf | ||
31 | add_project_arguments ('-DARM', language: 'c') | ||
32 | -- | ||
33 | 2.25.1 | ||
34 | |||
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index d5ba00ed2..e58980771 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | |||
@@ -34,13 +34,11 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin" | |||
34 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" | 34 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" |
35 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" | 35 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" |
36 | 36 | ||
37 | PV = "4.9.0+git${SRCPV}" | 37 | PV = "4.9.1+git${SRCPV}" |
38 | 38 | ||
39 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ | 39 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" |
40 | file://0011-meson-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS.patch \ | 40 | SRCBRANCH = "MM_04.09.01_2408_L6.6.y" |
41 | " | 41 | SRCREV = "87135d5f084b6c61efa6671cddc3a5509ab11640" |
42 | SRCBRANCH = "MM_04.09.00_2405_L6.6.y" | ||
43 | SRCREV = "c3049a137f79e4eabc98785aefcd217ebcde9e96" | ||
44 | 42 | ||
45 | S = "${WORKDIR}/git" | 43 | S = "${WORKDIR}/git" |
46 | 44 | ||