From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Mon, 25 Jan 2021 15:23:32 +0000 (-0600)
Subject: imx-gpu-viv: Align OpenCL package names
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=240813689aba1ec76a88d0cbb672f23ced6a2841;p=meta-freescale.git

imx-gpu-viv: Align OpenCL package names

The existing OpenCL recipes opencl-headers and opencl-icd-loader are dependencies
for clinfo. In order to build clinfo with imx-gpu-viv as provider, fix imx-gpu-viv
to provide the same recipe names.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 039b7557c9f243a882c7d008ff362137c6e70e15)
---

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index b4ab1fb6..f250620a 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -198,11 +198,11 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
     qtbase \
 "
 MACHINE_SOCARCH_FILTER_append_mx6q = " \
-    virtual/opencl-icd \
+    opencl-icd-loader \
     opencl-headers \
 "
 MACHINE_SOCARCH_FILTER_append_mx8 = " \
-    virtual/opencl-icd \
+    opencl-icd-loader \
     opencl-headers \
 "
 MACHINE_SOCARCH_FILTER_append_mx8qm = " \
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 43c79bd9..4ffc527d 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -44,10 +44,9 @@ PROVIDES += " \
     libgal-imx \
     opencl-headers \
     opencl-clhpp \
+    opencl-icd-loader \
     virtual/egl \
     virtual/libopenvg \
-    virtual/opencl-headers \
-    virtual/opencl-icd \
     ${PROVIDES_OPENVX} \
     ${EXTRA_PROVIDES} \
 "