Merge pull request #2069 from nxp-upstream/Upgrade-gstreamer-to-LF6.6…

….52_2.0.0

Gstreamer: Upgrade to LF-6.6.52_2.2.0

conf/machine/include/imx-base.inc

@@ -518,14 +518,14 @@ MACHINE_GSTREAMER_1_0_PLUGIN:mx8ulp-nxp-bsp ?= "imx-gst1.0-plugin"
 MACHINE_GSTREAMER_1_0_PLUGIN:mx93-nxp-bsp   ?= "imx-gst1.0-plugin"
 
 # GStreamer forked recipes
-PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.0.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:mx9-nxp-bsp ??= "1.24.0.imx"
+PREFERRED_VERSION_gstreamer1.0:mx8-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8-nxp-bsp  ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8-nxp-bsp ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8-nxp-bsp ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0:mx9-nxp-bsp              ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx9-nxp-bsp  ??= "1.24.7.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx9-nxp-bsp ??= "1.24.7.imx"
+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"

recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.0.imx.bb → recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.24.7.imx.bb

@@ -178,20 +178,17 @@ 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"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770"
 
 SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
                    file://0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch \
                    file://0002-avoid-including-sys-poll.h-directly.patch \
                    file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
                    "
 SRC_URI:prepend = "${GST1.0-PLUGINS-BAD_SRC};branch=${SRCBRANCH} "
-SRC_URI:append = " file://0001-autovideoconvert-add-imxvideoconvert_g2d.patch"
 GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https"
-SRCBRANCH = "MM_04.09.01_2408_L6.6.y"
-SRCREV = "7011fdfa6d60fb3ee1dc8545f675cfdb519203cd"
+SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
+SRCREV = "bba296b75dfb3e7ae4c836255edbd2b3c085c269"
 
 S = "${WORKDIR}/git"
 
@@ -214,13 +211,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d"
 PACKAGECONFIG[g2d] = ",,virtual/libg2d"
 PACKAGECONFIG[tinycompress]    = "-Dtinycompress=enabled,-Dtinycompress=disabled,tinycompress"
 
-# GCC-14 otherwise errors out
-CFLAGS += " \
-    -Wno-error=implicit-function-declaration \
-    -Wno-error=incompatible-pointer-types \
-    -Wno-error=return-mismatch \
-    -Wno-error=int-conversion \
-"
 EXTRA_OEMESON += " \
     -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
@@ -229,8 +219,9 @@ EXTRA_OEMESON:remove = " \
     -Dkate=disabled \
 "
 
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
 # 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 #########

recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.0.imx.bb → recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bb

@@ -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.01_2408_L6.6.y"
-SRCREV = "97b1a45e945d3784790cafd2fcc4f6cb16e739d7"
+SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
+SRCREV = "031d262e65333e58b2ce01aaf47ab1012f93b21e"
 
 S = "${WORKDIR}/git"
 
@@ -135,8 +135,6 @@ PACKAGECONFIG_G2D:imxgpu2d ??= "g2d"
 PACKAGECONFIG[g2d] = ",,virtual/libg2d"
 PACKAGECONFIG[viv-fb] = ",,virtual/libgles2"
 
-# GCC-14 otherwise errors out
-CFLAGS += "-Wno-error=incompatible-pointer-types"
 EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}""
 
 # links with imx-gpu libs which are pre-built for glibc

recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.%.bbappend → recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.24.7.imx.bbappend

@@ -13,5 +13,5 @@ PACKAGECONFIG_GL:use-mainline-bsp = \
 # does not depend on the viv-fb feature. It used to, but that was actually a bug
 # which was fixed in GStreamer 1.22.5. Since then, the direct texture support is
 # detected by Meson by checking for direct texture symbols like "glTexDirectVIV".)
-PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb "
-PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb "
+PACKAGECONFIG_GL:imxgpu2d:append:mx6-nxp-bsp = " viv-fb"
+PACKAGECONFIG_GL:imxgpu2d:append:mx7-nxp-bsp = " viv-fb"

recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.0.imx.bb → recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.7.imx.bb

@@ -94,11 +94,11 @@ FILES:${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
 DEFAULT_PREFERENCE = "-1"
 
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.txt;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+    file://LICENSE.txt;md5=69333daa044cb77e486cc36129f7a770 \
     file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe \
 "
 # Enable pulsesink in gstreamer
-PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', ' pulseaudio', '', d)}"
 
 # fb implementation of v4l2 uses libdrm
 DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'v4l2', '${DEPENDS_V4L2}', '', d)}"
@@ -111,20 +111,9 @@ 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.01_2408_L6.6.y"
-SRCREV = "d8727edd56536a5c39de7905f073fce61896c0af"
-
-# set 32bit compile timer for 32-bit platform
-GLIBC_64BIT_TIME_FLAGS:mx6-nxp-bsp = ""
-GLIBC_64BIT_TIME_FLAGS:mx7-nxp-bsp = ""
-INSANE_SKIP:mx6-nxp-bsp:append = " 32bit-time"
-INSANE_SKIP:mx7-nxp-bsp:append = " 32bit-time"
-
-# GCC-14 otherwise errors out
-CFLAGS += " \
-    -Wno-error=implicit-function-declaration \
-    -Wno-error=incompatible-pointer-types \
-"
+SRCBRANCH = "MM_04.09.02_2410_L6.6.y"
+SRCREV = "33b2732b873758a302064818b35dcad41b5bbc14"
+
 S = "${WORKDIR}/git"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"