Merge pull request #2284 from OSSystems/topic/gstreamer

Update gstreamer to LF6.12.3
This commit is contained in:
Otavio Salvador 2025-05-21 13:21:27 -03:00 committed by GitHub
commit 1f2e35923d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 20 additions and 22 deletions

View File

@ -75,9 +75,9 @@ UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
# wic based images.
SPL_BINARY ??= "${@get_spl_binary(d)}"
PREFERRED_PROVIDER_u-boot ??= "${IMX_DEFAULT_BOOTLOADER}"
PREFERRED_PROVIDER_u-boot-mfgtool ??= "${IMX_DEFAULT_BOOTLOADER}"
PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
PREFERRED_PROVIDER_u-boot ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
PREFERRED_PROVIDER_u-boot-mfgtool ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
@ -539,14 +539,14 @@ PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.7.imx"
# GStreamer copied recipes
PREFERRED_VERSION_gst-devtools:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gst-examples:mx8-nxp-bsp ??= "1.24.7.imx"
PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-libav:mx8-nxp-bsp ??= "1.24.7.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-python:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-vaapi:mx8-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gst-devtools:mx9-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gst-examples:mx9-nxp-bsp ??= "1.24.7.imx"
PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-libav:mx9-nxp-bsp ??= "1.24.7.imx"
PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx9-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-python:mx9-nxp-bsp ??= "1.24.0.imx"
PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx9-nxp-bsp ??= "1.24.0.imx"
@ -619,8 +619,8 @@ PREFERRED_VERSION_opencv:mx8-nxp-bsp ??= "4.6.0.imx"
PREFERRED_VERSION_opencv:mx9-nxp-bsp ??= "4.6.0.imx"
# Handle default kernel
IMX_DEFAULT_KERNEL:imx-mainline-bsp = "linux-fslc"
IMX_DEFAULT_KERNEL:imx-nxp-bsp = "linux-fslc-imx"
IMX_DEFAULT_KERNEL:imx-mainline-bsp ??= "linux-fslc"
IMX_DEFAULT_KERNEL:imx-nxp-bsp ??= "linux-fslc-imx"
PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"

View File

@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \
"
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${@get_gst_ver('${PV}')}.tar.xz"
SRC_URI[sha256sum] = "ab775d5b9a7c84176b29822b68c7a34731280039a20b7db5eb639eddd1466178"
SRC_URI[sha256sum] = "c3e4179ba183c2d3101edf87ff70dd07e728c766a5fee34e6ecded76ca5802df"
S = "${WORKDIR}/gst-libav-${@get_gst_ver('${PV}')}"

View File

@ -187,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.09.02_2410_L6.6.y"
SRCREV = "bba296b75dfb3e7ae4c836255edbd2b3c085c269"
SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
SRCREV = "7bb1254fcb0a0dcb1ecb4ac21efbc5068151943d"
S = "${WORKDIR}/git"
@ -219,9 +219,5 @@ EXTRA_OEMESON:remove = " \
-Dkate=disabled \
"
# it uses nested functions sadly, in ext/wayland/gstwaylandsink.c for GST_ELEMENT_REGISTER_DEFINE
#
TOOLCHAIN = "gcc"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
########### End of i.MX overrides #########

View File

@ -118,8 +118,8 @@ SRC_URI:remove = " \
SRC_URI:prepend = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} "
GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https"
SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
SRCREV = "031d262e65333e58b2ce01aaf47ab1012f93b21e"
SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
SRCREV = "858ae5a1fb2bd2692ca7ebbd5bde2eee14e1842d"
S = "${WORKDIR}/git"

View File

@ -111,8 +111,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plu
SRC_URI:prepend = "${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} "
GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
SRCREV = "33b2732b873758a302064818b35dcad41b5bbc14"
SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
SRCREV = "626a972e9ef448f1017cfad07a3486a0fb340a0d"
S = "${WORKDIR}/git"

View File

@ -100,8 +100,8 @@ SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV
"
SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} "
GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https"
SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
SRCREV = "1a8f23da16cd224574ab2386803149c76f2cb628"
SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
SRCREV = "e0d37a7d773a502956f54eced8cd701ec7fa5ff5"
S = "${WORKDIR}/git"

View File

@ -27,18 +27,20 @@ DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}"
DEPENDS_IMX_OPENCL_CONVERTER = "imx-opencl-converter"
DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp = ""
DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp = ""
DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp = "imx-opencl-converter"
DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = ""
DEPENDS_IMX_OPENCL_CONVERTER:mx95-nxp-bsp = "imx-opencl-converter"
# For backwards compatibility
RREPLACES:${PN} = "gst1.0-fsl-plugin"
RPROVIDES:${PN} = "gst1.0-fsl-plugin"
RCONFLICTS:${PN} = "gst1.0-fsl-plugin"
PV = "4.9.2+git${SRCPV}"
PV = "4.9.3+git${SRCPV}"
SRC_URI = "git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}"
SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
SRCREV = "ef9c1a080e739e6f0be878148d9f4a050dc83bec"
SRCBRANCH = "MM_04.09.03_2412_L6.12.y"
SRCREV = "370510ef8137874339df18a2a35ec1d04d98fa0b"
S = "${WORKDIR}/git"