diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2023-06-02 17:08:05 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-02 17:08:05 -0300 |
commit | 8995442f5432852a0313d83eb5fbc0fbd9e1c595 (patch) | |
tree | 5485b953e975214651a518b947606eddfda39699 /recipes-multimedia | |
parent | 3e876eb3a56e62e9c46d81d658d5ba799fcdde09 (diff) | |
parent | 8766f086d5d5c25163ecb3bd18e8881da7a538b0 (diff) | |
download | meta-freescale-8995442f5432852a0313d83eb5fbc0fbd9e1c595.tar.gz |
Merge pull request #1559 from thochstein/multimedia
gstreamer LF6.1.1-1.0.0 update
Diffstat (limited to 'recipes-multimedia')
6 files changed, 39 insertions, 26 deletions
diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb index 38d00b8e..41915bb5 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_git.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_git.bb | |||
@@ -13,15 +13,15 @@ RREPLACES:${PN} = "fsl-alsa-plugins" | |||
13 | RPROVIDES:${PN} = "fsl-alsa-plugins" | 13 | RPROVIDES:${PN} = "fsl-alsa-plugins" |
14 | RCONFLICTS:${PN} = "fsl-alsa-plugins" | 14 | RCONFLICTS:${PN} = "fsl-alsa-plugins" |
15 | 15 | ||
16 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" |
17 | 17 | ||
18 | inherit autotools pkgconfig use-imx-headers | 18 | inherit autotools pkgconfig use-imx-headers |
19 | 19 | ||
20 | PV = "1.0.26+${SRCPV}" | 20 | PV = "1.0.26+${SRCPV}" |
21 | 21 | ||
22 | SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" | 22 | SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" |
23 | SRCBRANCH = "MM_04.07.01_2208_L5.15.y" | 23 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
24 | SRCREV = "a9643b8820dd89b7a8c99941a90e9498f1b68c14" | 24 | SRCREV = "8ed567b446d49abe0498278b4da90ecc4db3e37d" |
25 | 25 | ||
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
@@ -32,6 +32,7 @@ EXTRA_OECONF = "CFLAGS="${INCLUDE_DIR}"" | |||
32 | PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}" | 32 | PACKAGECONFIG ??= "${PACKAGECONFIG_SWPDM}" |
33 | PACKAGECONFIG_SWPDM = "" | 33 | PACKAGECONFIG_SWPDM = "" |
34 | PACKAGECONFIG_SWPDM:mx8-nxp-bsp = "swpdm" | 34 | PACKAGECONFIG_SWPDM:mx8-nxp-bsp = "swpdm" |
35 | |||
35 | PACKAGECONFIG[swpdm] = "--enable-swpdm,--disable-swpdm,imx-sw-pdm" | 36 | PACKAGECONFIG[swpdm] = "--enable-swpdm,--disable-swpdm,imx-sw-pdm" |
36 | 37 | ||
37 | INSANE_SKIP:${PN} = "dev-so" | 38 | INSANE_SKIP:${PN} = "dev-so" |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb index 2dfe80b5..139107f5 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb | |||
@@ -176,6 +176,8 @@ FILES:${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs" | |||
176 | 176 | ||
177 | DEFAULT_PREFERENCE = "-1" | 177 | DEFAULT_PREFERENCE = "-1" |
178 | 178 | ||
179 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" | ||
180 | |||
179 | DEPENDS:append:imxgpu2d = " virtual/libg2d" | 181 | DEPENDS:append:imxgpu2d = " virtual/libg2d" |
180 | 182 | ||
181 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ | 183 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ |
@@ -185,8 +187,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plug | |||
185 | " | 187 | " |
186 | SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " | 188 | 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" | 189 | GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" |
188 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" | 190 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
189 | SRCREV = "cfb43ae30f9038a004ea1b916c74bc66f33e1171" | 191 | SRCREV = "6db7bca26b81468b647b680d7ef67b1b8b938b00" |
190 | 192 | ||
191 | S = "${WORKDIR}/git" | 193 | S = "${WORKDIR}/git" |
192 | 194 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb index 0ef9daea..f66ee05d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb | |||
@@ -17,7 +17,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba | |||
17 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ | 17 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ |
18 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 18 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
19 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ | 19 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ |
20 | file://0001-Fix-types-to-match-callback-functions.patch \ | ||
21 | " | 20 | " |
22 | SRC_URI[sha256sum] = "96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204" | 21 | SRC_URI[sha256sum] = "96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204" |
23 | 22 | ||
@@ -85,14 +84,6 @@ EXTRA_OEMESON += " \ | |||
85 | ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ | 84 | ${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \ |
86 | " | 85 | " |
87 | 86 | ||
88 | # Remove this meta package when moving to gstreamer 1.22+, this is for making | ||
89 | # gst packagegroups from master work with gstreamer 1.20.3.imx | ||
90 | PACKAGES += "${PN}-videoconvertscale" | ||
91 | |||
92 | ALLOW_EMPTY:${PN}-videoconvertscale = "1" | ||
93 | |||
94 | RDEPENDS:${PN}-videoconvertscale = "${PN}-videoconvert ${PN}-videoscale" | ||
95 | |||
96 | FILES:${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" | 87 | FILES:${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h" |
97 | FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" | 88 | FILES:${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" |
98 | 89 | ||
@@ -115,16 +106,19 @@ CVE_PRODUCT += "gst-plugins-base" | |||
115 | 106 | ||
116 | DEFAULT_PREFERENCE = "-1" | 107 | DEFAULT_PREFERENCE = "-1" |
117 | 108 | ||
109 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770" | ||
110 | |||
118 | SRC_URI:remove = " \ | 111 | SRC_URI:remove = " \ |
119 | https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ | 112 | https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ |
120 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ | 113 | file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ |
121 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 114 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
122 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" | 115 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch" |
123 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " | 116 | SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " |
117 | SRC_URI += "file://0001-Fix-types-to-match-callback-functions.patch" | ||
124 | SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" | 118 | SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" |
125 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" | 119 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" |
126 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" | 120 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
127 | SRCREV = "cbf542ce3e0bad1009d5ecf72707e870c375c3f0" | 121 | SRCREV = "fad4d243e030452b26dfbb2eb0f4d94befa4b9eb" |
128 | 122 | ||
129 | S = "${WORKDIR}/git" | 123 | S = "${WORKDIR}/git" |
130 | 124 | ||
@@ -150,6 +144,12 @@ EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}"" | |||
150 | # gcompat will address it during runtime | 144 | # gcompat will address it during runtime |
151 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" | 145 | LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined" |
152 | 146 | ||
147 | # Remove this meta package when moving to gstreamer 1.22+, this is for making | ||
148 | # gst packagegroups from master work with gstreamer 1.20.3.imx | ||
149 | PACKAGES += "${PN}-videoconvertscale" | ||
150 | ALLOW_EMPTY:${PN}-videoconvertscale = "1" | ||
151 | RDEPENDS:${PN}-videoconvertscale = "${PN}-videoconvert ${PN}-videoscale" | ||
152 | |||
153 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 153 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
154 | 154 | ||
155 | ########### End of i.MX overrides ######### | 155 | ########### End of i.MX overrides ######### |
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb index ccbf0196..95c8657e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb | |||
@@ -13,7 +13,6 @@ BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues | |||
13 | 13 | ||
14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ |
15 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ | 15 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ |
16 | file://0001-Add-prototype-declaration-for-gst_v4l2_object_stream.patch \ | ||
17 | " | 16 | " |
18 | 17 | ||
19 | SRC_URI[sha256sum] = "f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7" | 18 | SRC_URI[sha256sum] = "f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7" |
@@ -94,15 +93,22 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" | |||
94 | 93 | ||
95 | DEFAULT_PREFERENCE = "-1" | 94 | DEFAULT_PREFERENCE = "-1" |
96 | 95 | ||
96 | LIC_FILES_CHKSUM = " \ | ||
97 | file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | ||
98 | file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ | ||
99 | " | ||
100 | |||
97 | # fb implementation of v4l2 uses libdrm | 101 | # fb implementation of v4l2 uses libdrm |
98 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" | 102 | DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" |
99 | DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}" | 103 | DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}" |
104 | RDEPENDS:${PN}-soup += "${@bb.utils.contains('PACKAGECONFIG', 'soup', 'libsoup-2.4', '', d)}" | ||
100 | 105 | ||
101 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" | 106 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz" |
102 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " | 107 | SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " |
108 | SRC_URI += "file://0001-Add-prototype-declaration-for-gst_v4l2_object_stream.patch" | ||
103 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" | 109 | GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" |
104 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" | 110 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
105 | SRCREV = "643478677a4acb225dbb48e64720b06a7c6da668" | 111 | SRCREV = "5de04382c1c73e7b6d3c448a8902f358784d4567" |
106 | 112 | ||
107 | S = "${WORKDIR}/git" | 113 | S = "${WORKDIR}/git" |
108 | 114 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb index 2c419601..95d6425c 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb | |||
@@ -85,12 +85,17 @@ PTEST_BUILD_HOST_FILES = "" | |||
85 | 85 | ||
86 | DEFAULT_PREFERENCE = "-1" | 86 | DEFAULT_PREFERENCE = "-1" |
87 | 87 | ||
88 | LIC_FILES_CHKSUM = " \ | ||
89 | file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \ | ||
90 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \ | ||
91 | " | ||
92 | |||
88 | # Use i.MX fork of GST for customizations | 93 | # Use i.MX fork of GST for customizations |
89 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | 94 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" |
90 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | 95 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " |
91 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" | 96 | GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" |
92 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" | 97 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
93 | SRCREV = "6d2a525316b3f5cbda6a87fc5b213ab03055f320" | 98 | SRCREV = "e525a482611b2fccbebbc0f9fc32a88a707558fa" |
94 | 99 | ||
95 | S = "${WORKDIR}/git" | 100 | S = "${WORKDIR}/git" |
96 | 101 | ||
diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index 33b8e918..b43b7ddb 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | |||
@@ -20,10 +20,9 @@ RREPLACES:${PN} = "gst1.0-fsl-plugin" | |||
20 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" | 20 | RPROVIDES:${PN} = "gst1.0-fsl-plugin" |
21 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" | 21 | RCONFLICTS:${PN} = "gst1.0-fsl-plugin" |
22 | 22 | ||
23 | LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ | 23 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" |
24 | file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" | ||
25 | 24 | ||
26 | PV = "4.7.2+git${SRCPV}" | 25 | PV = "4.7.3+git${SRCPV}" |
27 | 26 | ||
28 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ | 27 | SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ |
29 | file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \ | 28 | file://0001-aiurdemux-Fix-type-of-USER_DATA_LOCATION.patch \ |
@@ -37,8 +36,8 @@ SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch= | |||
37 | file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \ | 36 | file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \ |
38 | file://0010-provide-declaration-for-aiur_register_external_typef.patch \ | 37 | file://0010-provide-declaration-for-aiur_register_external_typef.patch \ |
39 | " | 38 | " |
40 | SRCBRANCH = "MM_04.07.02_2210_L5.15.y" | 39 | SRCBRANCH = "MM_04.07.03_2301_L6.1.y" |
41 | SRCREV = "3a0250b983f2610e6936d10c63b45e2d39eadd7e" | 40 | SRCREV = "843215344b62de7a91d5880a4b093cd384c7b567" |
42 | 41 | ||
43 | S = "${WORKDIR}/git" | 42 | S = "${WORKDIR}/git" |
44 | 43 | ||