meta-xilinx-mali400: xf86-video-armsoc: Only apply when libmali-xlnx is enabledscarthgap

The patches add acceleration optimizations to the build, but should only be
enabled if libmali-xlnx is going to be used.  So switch based on DEPENDS,
and then adjust the DEPENDS to be switched based on the PREFERRED_PROVIDER
of virtual/libgles1.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/meta-xilinx-mali400/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend b/meta-xilinx-mali400/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
index e6ae6b42..ba44ca50 100644
--- a/meta-xilinx-mali400/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
+++ b/meta-xilinx-mali400/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
@@ -3,7 +3,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/xf86-video-armsoc:"
 EXTRA_MALI400_SRC = " file://0001-xf86-video-armosc-Accelerate-picture-composition.patch \
                       file://0001-xf86-video-armosc-Option-to-control-acceleration.patch \
                     "
-SRC_URI:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', '${EXTRA_MALI400_SRC}', '', d)}"
+DEPENDS:append = "${@' libmali-xlnx' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else ''}"
 
-DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'mali400', ' libmali-xlnx', '', d)}"
+SRC_URI:append = "${@bb.utils.contains('DEPENDS', 'libmali-xlnx', '${EXTRA_MALI400_SRC}', '', d)}"
 
+# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific
+DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@bb.utils.contains('DEPENDS', 'libmali-xlnx', '${MACHINE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}"