From 6b19e2160bef2a368336161340396354cae99203 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 1 Sep 2021 12:30:54 -0500 Subject: [PATCH] imx-gst1.0-plugin: Upgrade to 4.6.1 Includes switch to meson. Signed-off-by: Tom Hochstein --- ...in_4.5.7.bb => imx-gst1.0-plugin_4.6.1.bb} | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) rename recipes-multimedia/gstreamer/{imx-gst1.0-plugin_4.5.7.bb => imx-gst1.0-plugin_4.6.1.bb} (71%) diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb similarity index 71% rename from recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb rename to recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb index c8bb6cd8..ea059cd8 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.7.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.6.1.bb @@ -1,5 +1,5 @@ # Copyright (C) 2014,2016 Freescale Semiconductor -# Copyright 2017-2019 NXP +# Copyright 2017-2021 NXP # Copyright (C) 2012-2015 O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) @@ -20,16 +20,15 @@ RCONFLICTS_${PN} = "gst1.0-fsl-plugin" LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING-LGPL-2.1;md5=fbc093901857fcd118f065f900982c24" -SRCBRANCH = "MM_04.05.07_2011_L5.4.70" +SRCBRANCH = "MM_04.06.01_2105_L5.10.y" -SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ -" -SRCREV = "659ec4947d6b1903d26e4ec9e40ae251a659935d" + +SRC_URI = "git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH}" +SRCREV = "057e6bfbc208ce31e8ed0af0264dd1e86de05808" S = "${WORKDIR}/git" -inherit autotools pkgconfig use-imx-headers +inherit meson pkgconfig use-imx-headers PLATFORM_mx6 = "MX6" PLATFORM_mx6sl = "MX6SL" @@ -41,10 +40,9 @@ PLATFORM_mx7ulp= "MX7ULP" PLATFORM_mx8 = "MX8" # Todo add a mechanism to map possible build targets -EXTRA_OECONF = "PLATFORM=${PLATFORM} \ - CPPFLAGS="-I${STAGING_INCDIR_IMX}" \ - CROSS_ROOT=${PKG_CONFIG_SYSROOT_DIR} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', bb.utils.contains('DISTRO_FEATURES', 'x11', '--disable-x11', '', d), '', d)}" +EXTRA_OEMESON = "-Dplatform=${PLATFORM} \ + -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \ +" PACKAGES =+ "${PN}-gplay ${PN}-libgplaycore ${PN}-libgstfsl ${PN}-grecorder ${PN}-librecorder-engine ${PN}-libplayengine" @@ -60,14 +58,13 @@ PACKAGECONFIG_imxgpu2d = "overlaysink" # FIXME: Add all features # feature from excluded mm packages -PACKAGECONFIG[ac3] += ",,imx-ac3codec,imx-ac3codec" +PACKAGECONFIG[ac3] = ",,imx-ac3codec,imx-ac3codec" # feature from special mm packages -PACKAGECONFIG[aacp] += ",,imx-aacpcodec,imx-aacpcodec" +PACKAGECONFIG[aacp] = ",,imx-aacpcodec,imx-aacpcodec" MSDEPENDS = "imx-msparser imx-mscodec" -PACKAGECONFIG[wma10dec] += ",,${MSDEPENDS},${MSDEPENDS}" -PACKAGECONFIG[wma8enc] += "--enable-wma8enc,--disable-wma8enc,${MSDEPENDS},${MSDEPENDS}" -OVDEPENDS = "virtual/libg2d" -PACKAGECONFIG[overlaysink] += "--enable-overlaysink,--disable-overlaysink, ${OVDEPENDS}" +PACKAGECONFIG[wma10dec] = ",,${MSDEPENDS},${MSDEPENDS}" +PACKAGECONFIG[wma8enc] = ",,${MSDEPENDS},${MSDEPENDS}" +PACKAGECONFIG[overlaysink] += ",,virtual/libg2d" FILES_${PN} = "${libdir}/gstreamer-1.0/*.so ${datadir}" -- 2.40.1