From 9348d94d223bb3e236cea8bd9222da4de3608370 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 17 Jan 2024 18:45:06 +0100 Subject: [PATCH] ccimx93: update multimedia package for NXP release lf-6.1.55-2.2.0 Backport of multimedia package for ccimx93 from NXP's Mickledore-based lf-6.1.55-2.2.0 release. Mainly copies and appends of multimedia recipes from the new release, and restricted to ccimx93 by changing the COMPATIBLE_MACHINE, so it does not affect other platforms. https://onedigi.atlassian.net/browse/DEL-8840 Signed-off-by: Javier Viguera --- .../conf/machine/include/ccimx93.inc | 10 ++-- .../alsa/imx-alsa-plugins_git.bbappend | 4 +- ...=> gstreamer1.0-plugins-bad_1.22.5.imx.bb} | 12 ++--- ...> gstreamer1.0-plugins-base_1.22.5.imx.bb} | 16 +++--- ...> gstreamer1.0-plugins-good_1.22.5.imx.bb} | 13 ++--- ...bb => gstreamer1.0-plugins-ugly_1.22.6.bb} | 4 +- ...22.0.imx.bb => gstreamer1.0_1.22.5.imx.bb} | 10 ++-- .../gstreamer/imx-gst1.0-plugin_%.bbappend | 6 +-- .../imx-codec/imx-codec_4.8.1.bb | 13 ----- .../imx-codec/imx-codec_4.8.2.bb | 13 +++++ .../imx-dsp/imx-dsp-codec-ext_2.1.5.bb | 13 ----- .../imx-dsp/imx-dsp_2.1.5.bb | 13 ----- .../imx-parser/imx-parser_4.8.1.bb | 13 ----- .../imx-parser/imx-parser_4.8.2.bb | 13 +++++ .../nxp-afe/nxp-afe-voiceseeker_git.bb | 50 +++++++++++++++++++ .../recipes-multimedia/nxp-afe/nxp-afe_git.bb | 5 +- 16 files changed, 119 insertions(+), 89 deletions(-) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.22.0.imx.bb => gstreamer1.0-plugins-bad_1.22.5.imx.bb} (96%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.22.0.imx.bb => gstreamer1.0-plugins-base_1.22.5.imx.bb} (92%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.22.0.imx.bb => gstreamer1.0-plugins-good_1.22.5.imx.bb} (92%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.22.0.bb => gstreamer1.0-plugins-ugly_1.22.6.bb} (64%) rename meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/{gstreamer1.0_1.22.0.imx.bb => gstreamer1.0_1.22.5.imx.bb} (93%) delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb delete mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc index 124559061..60193819f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx93.inc +++ b/meta-digi-arm/conf/machine/include/ccimx93.inc @@ -77,11 +77,11 @@ ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3" ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs" ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}" -PREFERRED_VERSION_gstreamer1.0:ccimx93 ?= "1.22.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:ccimx93 ?= "1.22.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:ccimx93 ?= "1.22.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:ccimx93 ?= "1.22.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:ccimx93 ?= "1.22.0" +PREFERRED_VERSION_gstreamer1.0:ccimx93 ?= "1.22.5.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:ccimx93 ?= "1.22.5.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:ccimx93 ?= "1.22.5.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:ccimx93 ?= "1.22.5.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-ugly:ccimx93 ?= "1.22.6" PREFERRED_VERSION_libdrm:ccimx93 ?= "2.4.115.imx" PREFERRED_VERSION_nativesdk-wayland:ccimx93 ?= "1.22.0.imx" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend index 676539754..d1623a172 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend @@ -1,4 +1,4 @@ -# Copyright 2023 Digi International Inc. +# Copyright 2023,2024 Digi International Inc. -SRCBRANCH:ccimx93 = "MM_04.08.01_2308_L6.1.y" +SRCBRANCH:ccimx93 = "MM_04.08.02_2310_L6.1.y" SRCREV:ccimx93 = "b2ba082e70333f187972ee4e85f63f9d2f608331" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb similarity index 96% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb index 4548a34a5..d770502ad 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.0.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb @@ -3,12 +3,12 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: fb2d28e0315ece6180c87c7047587673024a09f7 +# Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9 require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc require recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc -DESCRIPTION = "'Bad' GStreamer plugins and helper libraries " +SUMMARY = "'Bad' GStreamer plugins and helper libraries " HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues" @@ -17,7 +17,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad file://0002-avoid-including-sys-poll.h-directly.patch \ file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ " -SRC_URI[sha256sum] = "3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1" +SRC_URI[sha256sum] = "e64e75cdafd7ff2fc7fc34e855b06b1e3ed227cc06fa378d17bbcd76780c338c" S = "${WORKDIR}/gst-plugins-bad-${PV}" @@ -67,7 +67,7 @@ PACKAGECONFIG[libde265] = "-Dlibde265=enabled,-Dlibde265=disabled,libde26 PACKAGECONFIG[libssh2] = "-Dcurl-ssh2=enabled,-Dcurl-ssh2=disabled,libssh2" PACKAGECONFIG[lcms2] = "-Dcolormanagement=enabled,-Dcolormanagement=disabled,lcms" PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" -PACKAGECONFIG[msdk] = "-Dmsdk=enabled,-Dmsdk=disabled,intel-mediasdk" +PACKAGECONFIG[msdk] = "-Dmsdk=enabled -Dmfx_api=oneVPL,-Dmsdk=disabled,onevpl-intel-gpu" PACKAGECONFIG[neon] = "-Dneon=enabled,-Dneon=disabled,neon" PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" PACKAGECONFIG[opencv] = "-Dopencv=enabled,-Dopencv=disabled,opencv" @@ -188,8 +188,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.08.01_2308_L6.1.y" -SRCREV = "fd7a399c3a9c43b5675bc2497ad8a23540bf720e" +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" +SRCREV = "e4edcda6b110f42eca1f2cc20bc935edf7e66d6d" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb similarity index 92% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb index 3a7bfa9e4..c4391f3c8 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.0.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb @@ -3,11 +3,11 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: fb2d28e0315ece6180c87c7047587673024a09f7 +# Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9 require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc -DESCRIPTION = "'Base' GStreamer plugins and helper libraries" +SUMMARY = "'Base' GStreamer plugins and helper libraries" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues" LICENSE = "LGPL-2.1-or-later" @@ -18,7 +18,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba file://0003-viv-fb-Make-sure-config.h-is-included.patch \ file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ " -SRC_URI[sha256sum] = "f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d" +SRC_URI[sha256sum] = "edd4338b45c26a9af28c0d35aab964a024c3884ba6f520d8428df04212c8c93a" S = "${WORKDIR}/gst-plugins-base-${PV}" @@ -28,7 +28,8 @@ inherit gobject-introspection # opengl packageconfig factored out to make it easy for distros # and BSP layers to choose OpenGL APIs/platforms/window systems -PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" +PACKAGECONFIG_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl glx', '', d)}" +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl ${PACKAGECONFIG_X11}', '', d)}" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ @@ -39,7 +40,7 @@ PACKAGECONFIG ??= " \ " OPENGL_APIS = 'opengl gles2' -OPENGL_PLATFORMS = 'egl' +OPENGL_PLATFORMS = 'egl glx' X11DEPENDS = "virtual/libx11 libsm libxrender libxv" X11ENABLEOPTS = "-Dx11=enabled -Dxvideo=enabled -Dxshm=enabled" @@ -68,6 +69,7 @@ PACKAGECONFIG[gles2] = ",,virtual/libgles2" # OpenGL platform packageconfigs PACKAGECONFIG[egl] = ",,virtual/egl" +PACKAGECONFIG[glx] = ",,virtual/libgl" # OpenGL window systems (except for X11) PACKAGECONFIG[gbm] = ",,virtual/libgbm libgudev libdrm" @@ -116,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.08.01_2308_L6.1.y" -SRCREV = "f7c109c3b09645266ad41139253f32cf70a7d692" +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" +SRCREV = "53a12f4e39773ca5b052eccbf0476d4ebd3ac08e" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb similarity index 92% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb index 7e017c9fa..4fdf4408d 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.0.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb @@ -3,19 +3,19 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: fb2d28e0315ece6180c87c7047587673024a09f7 +# Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9 require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc -DESCRIPTION = "'Good' GStreamer plugins" +SUMMARY = "'Good' GStreamer plugins" HOMEPAGE = "https://gstreamer.freedesktop.org/" BUGTRACKER = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues" SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ - " + file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" -SRC_URI[sha256sum] = "582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0" +SRC_URI[sha256sum] = "b67b31313a54c6929b82969d41d3cfdf2f58db573fb5f491e6bba5d84aea0778" S = "${WORKDIR}/gst-plugins-good-${PV}" @@ -104,12 +104,13 @@ DEPENDS_V4L2 = "${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', ' SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ + file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch \ " 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.08.01_2308_L6.1.y" -SRCREV = "ca3ef27dd4020393bfda546a25a3fa28314276e1" +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" +SRCREV = "a4631334ad32abc513bde8f73491ef345f865a48" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb similarity index 64% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb index 17af53d30..b457a05f7 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.0.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb @@ -1,4 +1,4 @@ -# Copyright 2023 Digi International Inc. +# Copyright 2024 Digi International Inc. # # Reuse poky's gstreamer1.0-plugins-ugly_1.20.7.bb @@ -7,6 +7,6 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.20.7.bb LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI[sha256sum] = "a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c" +SRC_URI[sha256sum] = "3e31454c98cb2f7f6d2d355eceb933a892fa0f1dc09bc36c9abc930d8e29ca48" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb similarity index 93% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb index 90d0ed55d..a4a0213e6 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.imx.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb @@ -3,7 +3,7 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: fb2d28e0315ece6180c87c7047587673024a09f7 +# Upstream hash: 937817e5164f8af8452aec03ae3c45cb23d63df9 SUMMARY = "GStreamer 1.0 multimedia framework" DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ @@ -29,7 +29,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ " -SRC_URI[sha256sum] = "78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09" +SRC_URI[sha256sum] = "4408d7930f381809e85917acc19712f173261ba85bdf20c5567b2a21b1193b61" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ check \ @@ -74,6 +74,8 @@ FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-5" + CVE_PRODUCT = "gstreamer" PTEST_BUILD_HOST_FILES = "" @@ -98,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.08.01_2308_L6.1.y" -SRCREV = "95112902507718085231a933cdfe54e3997d1b28" +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" +SRCREV = "e51e577a730191911b7050216814bede1b9545ae" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend index 01718e916..00076e274 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend @@ -8,6 +8,6 @@ SRC_URI:append:ccimx6ul = " \ " LIC_FILES_CHKSUM:ccimx93 = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -PV:ccimx93 = "4.8.1+git${SRCPV}" -SRCBRANCH:ccimx93 = "MM_04.08.01_2308_L6.1.y" -SRCREV:ccimx93 = "903c03e8611a107508b1f60e4736df208e72247d" +PV:ccimx93 = "4.8.2+git${SRCPV}" +SRCBRANCH:ccimx93 = "MM_04.08.02_2310_L6.1.y" +SRCREV:ccimx93 = "a72df52acfec5f849ec93906e33cb50da01b0b2e" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb deleted file mode 100644 index 88544b5a9..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2023 Digi International Inc. - -# -# Reuse meta-freescale's imx-codec_4.7.2.bb -# -require recipes-multimedia/imx-codec/imx-codec_4.7.2.bb - -LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[md5sum] = "a47f6407459ab4889e1bd9651b9dd40b" -SRC_URI[sha256sum] = "0d0668dadbd69c40c1d0e29cbf4082df008a7cb7ec7e5cfe7d8f228395bdaf58" - -COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb new file mode 100644 index 000000000..5f821d078 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb @@ -0,0 +1,13 @@ +# Copyright 2024 Digi International Inc. + +# +# Reuse meta-freescale's imx-codec_4.7.2.bb +# +require recipes-multimedia/imx-codec/imx-codec_4.7.2.bb + +LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" + +SRC_URI[md5sum] = "1977bab8d89972f08d9eee0122a64603" +SRC_URI[sha256sum] = "b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0" + +COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb deleted file mode 100644 index 453ed5db9..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.1.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2023 Digi International Inc. - -# -# Reuse meta-freescale's imx-dsp-codec-ext_2.0.2.bb -# -require recipes-multimedia/imx-dsp/imx-dsp-codec-ext_2.0.2.bb - -LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[md5sum] = "4619cebbad2f312b950a9ad2b2e30e24" -SRC_URI[sha256sum] = "89ac92b348aa70c81dcbf6a9ee4bc99bec56a491a89f5ba9854eab77e5fd4298" - -COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb deleted file mode 100644 index cc3159c56..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-dsp/imx-dsp_2.1.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2023 Digi International Inc. - -# -# Reuse meta-freescale's imx-dsp_2.0.2.bb -# -require recipes-multimedia/imx-dsp/imx-dsp_2.0.2.bb - -LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[md5sum] = "2b2581a4b24735f4e449a161a334e04d" -SRC_URI[sha256sum] = "11f4e89c0d3c61ac591aa3e00e345d7cc8d0d2627a915253f920cdcf4492a7d5" - -COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb deleted file mode 100644 index f308ece19..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2023 Digi International Inc. - -# -# Reuse meta-freescale's imx-parser_4.7.2.bb -# -require recipes-multimedia/imx-parser/imx-parser_4.7.2.bb - -LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de" - -SRC_URI[md5sum] = "c7a8aae8114d0756ed858000b78e9d8e" -SRC_URI[sha256sum] = "73b8ce76507f25d72192862a939405625086a6631fba6f58e4e6bef2614fd202" - -COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb new file mode 100644 index 000000000..ae755bcb1 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb @@ -0,0 +1,13 @@ +# Copyright 2024 Digi International Inc. + +# +# Reuse meta-freescale's imx-parser_4.7.2.bb +# +require recipes-multimedia/imx-parser/imx-parser_4.7.2.bb + +LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7" + +SRC_URI[md5sum] = "2e862fce70bc82649057ed552473d982" +SRC_URI[sha256sum] = "20f326821ced5d6855f81794b66ec1f0c334e9ec7a9be1368a9b4dc501b666c6" + +COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb new file mode 100644 index 000000000..54fd3f29a --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe-voiceseeker_git.bb @@ -0,0 +1,50 @@ +# Copyright 2021-2023 NXP + +DESCRIPTION = "NXP RetuneDSP Voice Seeker Libraries" +SECTION = "multimedia" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=db4762b09b6bda63da103963e6e081de" + +inherit autotools pkgconfig + +DEPENDS += "alsa-lib nxp-afe" + +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" +PV = "2.0+${SRCPV}" + +NXPAFE_VOICESEEKER_SRC ?= "git://github.com/nxp-imx/imx-voiceui.git;protocol=https" +SRC_URI = "${NXPAFE_VOICESEEKER_SRC};branch=${SRCBRANCH}" + +SRCREV = "5eac64dc0f93c755941770c46d5e315aec523b3d" +S = "${WORKDIR}/git" + +EXTRA_CONF = "--enable-armv8 --bindir=/unit_tests/ --libdir=${libdir}" + +EXTRA_OEMAKE:mx8-nxp-bsp = "BUILD_ARCH=CortexA53" +EXTRA_OEMAKE:mx93-nxp-bsp = "BUILD_ARCH=CortexA55" + +do_compile () { + echo "====Enter into ${WORKDIR}/git====" + cd ${WORKDIR}/git + echo "====make all===" + oe_runmake all +} + +do_install() { + install -d ${D}${libdir}/nxp-afe + install -d ${D}/unit_tests/nxp-afe + install -m 0644 ${WORKDIR}/git/release/*.so.2.0 ${D}${libdir}/nxp-afe/ + ln -sf -r ${D}${libdir}/nxp-afe/libvoiceseekerlight.so.2.0 ${D}${libdir}/nxp-afe/libvoiceseekerlight.so + install -m 0755 ${WORKDIR}/git/release/voice_ui_app ${D}/unit_tests/nxp-afe + install -m 0644 ${WORKDIR}/git/release/*.bin ${D}/unit_tests/nxp-afe + install -m 0644 ${WORKDIR}/git/release/Config.ini ${D}/unit_tests/nxp-afe +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FILES:${PN} += "${libdir}/nxp-afe/* \ + /unit_tests/* \ +" +INSANE_SKIP:${PN} += "dev-so" + +COMPATIBLE_MACHINE = "(mx8-nxp-bsp|mx9-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb index 5125f8465..d8dc25472 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb @@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012" PV = "1.0+git${SRCPV}" -SRCBRANCH = "MM_04.06.03_2110_L5.10.y" +SRCBRANCH = "MM_04.08.02_2310_L6.1.y" NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https" SRC_URI = " \ ${NXPAFE_SRC};branch=${SRCBRANCH} \ " -SRCREV = "7d3295d250fe34325123cc9df94902a083308a46" +SRCREV = "77343e302fb079e3d50f6c6d0eef565c09256e56" S = "${WORKDIR}/git" @@ -33,6 +33,7 @@ do_install() { install -m 0755 ${WORKDIR}/deploy_afe/afe ${D}/unit_tests/nxp-afe install -m 0644 ${WORKDIR}/deploy_afe/asound.conf* ${D}/unit_tests/nxp-afe install -m 0644 ${WORKDIR}/deploy_afe/TODO.md ${D}/unit_tests/nxp-afe + install -m 0755 ${WORKDIR}/deploy_afe/UAC_VCOM_composite.sh ${D}/unit_tests/nxp-afe } FILES:${PN} += "/unit_tests"