From 410f5a404c12db9b34d29e9b8f62c523d0790a84 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 1 Jul 2016 15:39:12 -0300 Subject: imx-gpu-viv: Refactor code to use the new overrides The recipe has been reworked to use the 'imxgpu2d' and 'imxgpu3d' feature overrides. While on that, the i.MX6SL specific code has been reworked to used when only 2D GPU support is available. Change-Id: Ied0415ed9e8cc27682d8516e432165e6327a6773 Signed-off-by: Otavio Salvador --- recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index e99c4a1a..8536461d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc @@ -13,9 +13,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxd libpng" EXTRA_PROVIDES = "" -EXTRA_PROVIDES_mx6q = " virtual/libgl virtual/libgles1 virtual/libgles2" -EXTRA_PROVIDES_mx6dl = " virtual/libgl virtual/libgles1 virtual/libgles2" -EXTRA_PROVIDES_mx6sx = " virtual/libgl virtual/libgles1 virtual/libgles2" +EXTRA_PROVIDES_imxgpu3d = " virtual/libgl virtual/libgles1 virtual/libgles2" PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}" PE = "1" @@ -94,8 +92,8 @@ python __anonymous() { d.appendVar("RCONFLICTS_" + fullp, pkgs) } -IS_MX6SL = "0" -IS_MX6SL_mx6sl = "1" +IMXGPU_imxgpu3d = "3d" +IMXGPU_imxgpu2d = "2d" do_install () { install -d ${D}${libdir} @@ -182,8 +180,9 @@ do_install () { find ${D}${libdir} -name "*.$backend.so" -exec rm '{}' ';' done - # FIXME: MX6SL does not have 3D support; hack it for now - if [ "${IS_MX6SL}" = "1" ]; then + # FIXME: For 2D only GPU, we need to remove some content which is + # 3D specific. + if [ "${IMXGPU}" = "2d" ]; then rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \ \ ${D}${libdir}/libGL* ${D}${includedir}/GL* \ -- cgit v1.2.3-54-g00ecf