From 9979bd20a2d9863b911e5da8660c7061c64291bc Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 24 Jan 2017 10:45:10 -0200 Subject: [PATCH] mesa: Rework recipe to use the feature overrides The recipe was still using the mx6 specific overrides, which is wrong. We should use the feature overrides so more SoCs can be dealt in the generic way. Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa_%.bbappend | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 8f5aa751..3005fd73 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,15 +1,12 @@ -PACKAGECONFIG_remove_mx6 = "egl gles" +PACKAGECONFIG_remove_imxgpu2d = "egl gles" -PROVIDES_remove_mx6 = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl" +PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl" PROVIDES_remove_imxgpu3d = "virtual/libgl" -USE_VIV_LIBGL = "yes" -USE_VIV_LIBGL_mx6sl = "no" - # FIXME: mesa should support 'x11-no-tls' option python () { overrides = d.getVar("OVERRIDES", True).split(":") - if "mx6" not in overrides: + if "imxgpu2d" not in overrides: return extra_oeconf = d.getVar("EXTRA_OECONF", True) @@ -18,10 +15,8 @@ python () { } # FIXME: Dirty hack to allow use of Vivante GPU libGL binary -do_install_append_mx6 () { - if [ "${USE_VIV_LIBGL}" = "yes" ]; then - rm -f ${D}${libdir}/libGL.* \ - ${D}${includedir}/GL/gl.h \ - ${D}${includedir}/GL/glext.h - fi +do_install_append_imxgpu3d () { + rm -f ${D}${libdir}/libGL.* \ + ${D}${includedir}/GL/gl.h \ + ${D}${includedir}/GL/glext.h } -- 2.40.1