1 files changed, 11 insertions, 5 deletions

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 fb18f1bb..70ae8937 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"
@@ -31,18 +31,24 @@ LIBG2D_DEPENDENCIES = "virtual/libg2d"
 LIBG2D_DPU_OPTION:imxdpu = "-Dg2d-based-on-dpu=true"
 LIBG2D_DEPENDENCIES:imxdpu = "virtual/libg2d libdrm"
 
-EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX}"
+# v4l2-amphion and v4l2-isi are meant for the Amphion Malone
+# VPU decoder and the ISI drivers in older kernels, which had
+# lots of bugs that required nontrivial workarounds. In the
+# kernels in this release, newer drivers are present, which
+# obviate the need for these special elements.
+EXTRA_OEMESON += "-Dimx-headers-path=${STAGING_INCDIR_IMX} -Dv4l2-amphion=disabled -Dv4l2-isi=false"
 
 PACKAGECONFIG ?= "uniaudiodec"
 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-nxp-bsp      = " imx2dvideosink v4l2"
+PACKAGECONFIG:append:mx6-nxp-bsp      = " imx2dvideosink v4l2-mxc-source-sink"
 PACKAGECONFIG:append:mx7-nxp-bsp      = " imx2dvideosink"
 
 PACKAGECONFIG[g2d] = "-Dg2d=enabled ${LIBG2D_DPU_OPTION},-Dg2d=disabled,${LIBG2D_DEPENDENCIES}"
@@ -50,7 +56,7 @@ 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,"
 PACKAGECONFIG[uniaudiodec] = "-Duniaudiodec=enabled,-Duniaudiodec=disabled,imx-codec"
 PACKAGECONFIG[mp3encoder] = "-Dmp3encoder=enabled,-Dmp3encoder=disabled,imx-codec"