From bc76826c4f51f163afa953fe20ba18de66e0d3bc Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 8 Nov 2023 18:39:44 -0500 Subject: gstreamer1.0-plugins-bad: fix build failure with NXP BSP Our local patch does not apply against NXP's forked version, so disable applying it when building for machines that are using the NXP BSP (currently only imx8mq-evk-viv). Bug-AGL: SPEC-4962 Change-Id: I8b716c658dbe92e543f3899ea15539ed59dce96b Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29392 ci-image-boot-test: Jenkins Job builder account ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../gstreamer1.0-plugins-bad_aglcore.inc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-agl-core/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_aglcore.inc b/meta-agl-core/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_aglcore.inc index 831862aff..97a0c1688 100644 --- a/meta-agl-core/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_aglcore.inc +++ b/meta-agl-core/recipes-multimedia/gstreamer1.0-plugins-bad/gstreamer1.0-plugins-bad_aglcore.inc @@ -1,2 +1,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI:append = "file://0001-Added-appid-and-title-support.patch" + +AGL_PATCHES = "file://0001-Added-appid-and-title-support.patch" + +# Above patch fails to apply against NXP's forked version, disable +# for now +AGL_PATCHES:use-nxp-bsp = "" + +SRC_URI:append = " ${AGL_PATCHES}" -- cgit 1.2.3-korg