From 0ed3242eb097938e20fbe938393c75a5690689eb Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 1 Jun 2023 08:26:07 -0700 Subject: gstreamer1.0*: Update MM_04.07.02_2210_L5.15.y -> MM_04.07.03_2301_L6.1.y Signed-off-by: Tom Hochstein --- .../gstreamer/gstreamer1.0-plugins-bad_1.20.3.imx.bb | 6 ++++-- .../gstreamer/gstreamer1.0-plugins-base_1.20.3.imx.bb | 6 ++++-- .../gstreamer/gstreamer1.0-plugins-good_1.20.3.imx.bb | 9 +++++++-- recipes-multimedia/gstreamer/gstreamer1.0_1.20.3.imx.bb | 9 +++++++-- recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | 9 ++++----- 5 files changed, 26 insertions(+), 13 deletions(-) (limited to 'recipes-multimedia/gstreamer') 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" DEFAULT_PREFERENCE = "-1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" + DEPENDS:append:imxgpu2d = " virtual/libg2d" 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 " SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} " GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "cfb43ae30f9038a004ea1b916c74bc66f33e1171" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "6db7bca26b81468b647b680d7ef67b1b8b938b00" S = "${WORKDIR}/git" 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 ebd143ef..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 @@ -106,6 +106,8 @@ CVE_PRODUCT += "gst-plugins-base" DEFAULT_PREFERENCE = "-1" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770" + SRC_URI:remove = " \ https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \ @@ -115,8 +117,8 @@ SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} " SRC_URI += "file://0001-Fix-types-to-match-callback-functions.patch" SRC_URI += "file://0001-gstallocatorphymem.c-Typecast-result-of-gst_phymem_g.patch" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "cbf542ce3e0bad1009d5ecf72707e870c375c3f0" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "fad4d243e030452b26dfbb2eb0f4d94befa4b9eb" S = "${WORKDIR}/git" 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 7f4b4f78..feb4b06c 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 @@ -93,6 +93,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" DEFAULT_PREFERENCE = "-1" +LIC_FILES_CHKSUM = " \ + file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \ +" + # fb implementation of v4l2 uses libdrm DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}" DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'libdrm', d)}" @@ -101,8 +106,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-pl SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} " SRC_URI += "file://0001-Add-prototype-declaration-for-gst_v4l2_object_stream.patch" GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "643478677a4acb225dbb48e64720b06a7c6da668" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "5de04382c1c73e7b6d3c448a8902f358784d4567" S = "${WORKDIR}/git" 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 = "" DEFAULT_PREFERENCE = "-1" +LIC_FILES_CHKSUM = " \ + file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \ + file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d \ +" + # Use i.MX fork of GST for customizations SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "6d2a525316b3f5cbda6a87fc5b213ab03055f320" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "e525a482611b2fccbebbc0f9fc32a88a707558fa" S = "${WORKDIR}/git" 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" RPROVIDES:${PN} = "gst1.0-fsl-plugin" RCONFLICTS:${PN} = "gst1.0-fsl-plugin" -LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -PV = "4.7.2+git${SRCPV}" +PV = "4.7.3+git${SRCPV}" SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ 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= file://0009-gstimxv4l2.c-Fix-incompatible-integer-to-pointer-con.patch \ file://0010-provide-declaration-for-aiur_register_external_typef.patch \ " -SRCBRANCH = "MM_04.07.02_2210_L5.15.y" -SRCREV = "3a0250b983f2610e6936d10c63b45e2d39eadd7e" +SRCBRANCH = "MM_04.07.03_2301_L6.1.y" +SRCREV = "843215344b62de7a91d5880a4b093cd384c7b567" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf