Merge pull request #1631 from dv1/imxdmabuffer-imxvpuapi-gstimx-upgrades-dunfell

Dunfell specific upgrades for libimxdmabuffer, libimxvpuapi2, gstreamer-imx

5 files changed, 39 insertions, 36 deletions

diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb
index a44c9027..286f3c87 100644
--- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb
+++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.1.0.bb
@@ -13,4 +13,23 @@ S = "${WORKDIR}/${BPN}-${PV}"
 SRC_URI[md5sum] = "5c254523ae4c44491ea838e84e9aee49"
 SRC_URI[sha256sum] = "c5dd1fbf8c9776d7a2844a225e0aa2e489aa24eaab8f55cb48a6e3184def235d"
 
+# SCR is the location and name of the Software Content Register file
+# relative to ${D}${D_SUBDIR}.
+SCR = "SCR.txt"
+
+do_install () {
+    install -d ${D}${D_SUBDIR}
+    cp -r ${S}/* ${D}${D_SUBDIR}
+    if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then
+        mv ${D}/usr/lib ${D}${libdir}
+    fi
+    rm ${D}${D_SUBDIR}/COPYING
+    if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then
+        bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\""
+    fi
+    rm ${D}${D_SUBDIR}/${SCR}
+}
+
+FILES_${PN} = "/"
+
 COMPATIBLE_MACHINE = "(mx8mp)"
diff --git a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch
deleted file mode 100644
index 490d3a2f..00000000
--- a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 41825b11289be251fed64470893d18b89b0dd38b Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani <crg7475@mailbox.org>
-Date: Sun, 8 May 2022 16:25:44 +0200
-Subject: [PATCH] g2d: Fix typo
-
-Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
-
-Upstream-Status: Backport [41825b11289be251fed64470893d18b89b0dd38b]
----
- imxdmabuffer/imxdmabuffer_g2d_allocator.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imxdmabuffer/imxdmabuffer_g2d_allocator.c b/imxdmabuffer/imxdmabuffer_g2d_allocator.c
-index f10a909..497dcea 100644
---- a/imxdmabuffer/imxdmabuffer_g2d_allocator.c
-+++ b/imxdmabuffer/imxdmabuffer_g2d_allocator.c
-@@ -139,7 +139,7 @@ static uint8_t* imx_dma_buffer_g2d_allocator_map(ImxDmaBufferAllocator *allocato
-         * (Other allocators perform more steps than this.) */
-        if (imx_g2d_buffer->mapping_refcount > 0)
-        {
--               assert((imx_dwl_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK));
-+               assert((imx_g2d_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK));
-                imx_g2d_buffer->mapping_refcount++;
-        }
-        else
--- 
-2.32.0
-
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
index dd3b65da..bc40a1cf 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.3.bb
@@ -8,9 +8,8 @@ SECTION = "base"
 PV .= "+git${SRCPV}"
 
 SRCBRANCH ?= "master"
-SRCREV = "5410b44fb0c5bbd9fb1f3ba0681e65068d8cde57"
+SRCREV = "faf547cc2345bfbf95507ab7e86530f85289bb5b"
 SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
-           file://0001-g2d-Fix-typo.patch \
            file://run-ptest \
           "
 
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.1.0.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
index 9b3bc9b7..7e2f2573 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.1.0.bb
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-imx_2.2.0.bb
@@ -15,7 +15,7 @@ RDEPENDS_gstreamer1.0-plugins-imx-imxvpu = "gstreamer1.0-plugins-bad-videoparser
 PV .= "+git${SRCPV}"
 
 SRCBRANCH ?= "master"
-SRCREV = "b1e5cca1a6df9d2c0dc505ae222775798108d340"
+SRCREV = "cb3cd45676e808b222ac573e8a118f44fd70c288"
 SRC_URI = "git://github.com/Freescale/gstreamer-imx.git;branch=${SRCBRANCH};protocol=https"
 
 S = "${WORKDIR}/git"
@@ -46,19 +46,29 @@ PACKAGECONFIG_append_imxgpu2d = " g2d"
 PACKAGECONFIG_append_imxvpu   = " vpu"
 PACKAGECONFIG_append_imxipu   = " ipu"
 PACKAGECONFIG_append_imxpxp   = " pxp"
-# The custom imxv4l2 elements are only available on the i.MX6.
+# The custom imxv4l2 source and sink elements are only
+# available on the i.MX6.
 # The 2D blitter sinks require an MXC framebuffer, which
 # is not available anymore on the i.MX8 (since these SoCs
 # now use KMS instead of the old Linux framebuffer).
-PACKAGECONFIG_append_mx6      = " imx2dvideosink v4l2"
+PACKAGECONFIG_append_mx6      = " imx2dvideosink v4l2-mxc-source-sink"
 PACKAGECONFIG_append_mx7      = " imx2dvideosink"
+# The custom Amphion V4L2 mem-2-mem elements are meant for
+# the QuadMax and QuadXPlus SoCs.
+PACKAGECONFIG_append_mx8qm    = " v4l2-amphion"
+PACKAGECONFIG_append_mx8qxp   = " v4l2-amphion"
 
 PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}"
 PACKAGECONFIG[pxp] = "-Dpxp=enabled,-Dpxp=disabled,"
 PACKAGECONFIG[ipu] = "-Dipu=enabled,-Dipu=disabled,"
 PACKAGECONFIG[vpu] = "-Dvpu=enabled,-Dvpu=disabled,libimxvpuapi2"
 PACKAGECONFIG[imx2dvideosink] = "-Dimx2d-videosink=true,-Dimx2d-videosink=false,"
-PACKAGECONFIG[v4l2] = "-Dv4l2=true,-Dv4l2=false,"
+PACKAGECONFIG[v4l2-mxc-source-sink] = "-Dv4l2-mxc-source-sink=true,-Dv4l2-mxc-source-sink=false,"
+# v4l2-isi is not enabled by default because the ISI devices
+# need to be turned on in the devicetree. See the readme on
+# the gstreamer-imx github site for details.
+PACKAGECONFIG[v4l2-isi] = "-Dv4l2-isi=true,-Dv4l2-isi=false,"
+PACKAGECONFIG[v4l2-amphion] = "-Dv4l2-amphion=enabled,-Dv4l2-amphion=disabled,"
 PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec"
 PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec"
 
diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.2.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb
index c0ee358a..51e6b554 100644
--- a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.2.bb
+++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.3.0.bb
@@ -4,11 +4,14 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324"
 SECTION = "multimedia"
 DEPENDS = "virtual/imxvpu libimxdmabuffer"
+# Add imx-vpu-hantro-vc as dependency for being
+# able to encode video using the VC8000E encoder
+DEPENDS_append_mx8mp = " imx-vpu-hantro-vc"
 
 PV .= "+git${SRCPV}"
 
 SRCBRANCH ?= "master"
-SRCREV = "b6486118d47937cd717c4881158dda6e72cf2855"
+SRCREV = "6f803f46d6b53a08cf02fc3d440072e01e2f3a09"
 SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH};protocol=https"
 
 S = "${WORKDIR}/git"
@@ -18,7 +21,7 @@ inherit waf pkgconfig use-imx-headers
 IMX_PLATFORM_mx6 = "imx6"
 IMX_PLATFORM_mx8mq = "imx8m"
 IMX_PLATFORM_mx8mm = "imx8mm"
-IMX_PLATFORM_mx8mp = "imx8mm"
+IMX_PLATFORM_mx8mp = "imx8mp"
 
 EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}"