From 3be3c2736231acb219feb6c00523f9a6f36d28ea Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Dec 2017 11:30:58 -0600 Subject: [PATCH] mesa: Remove parts provided by imx-gpu-viv v6 Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa_%.bbappend | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index a89184ec..74396ae8 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_remove_imxgpu2d = "egl gles" +PACKAGECONFIG_remove_imxgpu2d = "egl gles gbm" -PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl" +PROVIDES_remove_imxgpu2d = "virtual/libgles1 virtual/libgles2 virtual/libopenvg virtual/egl gbm" PROVIDES_remove_imxgpu3d = "virtual/libgl" # FIXME: mesa should support 'x11-no-tls' option @@ -17,11 +17,25 @@ python () { PACKAGECONFIG_append_use-mainline-bsp = " gallium" GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx" +BACKEND = \ + "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ + 'fb', d), d)}" + # FIXME: Dirty hack to allow use of Vivante GPU libGL binary do_install_append_imxgpu3d () { rm -f ${D}${libdir}/libGL.* \ ${D}${includedir}/GL/gl.h \ - ${D}${includedir}/GL/glext.h + ${D}${includedir}/GL/glext.h \ + ${D}${includedir}/GL/glx.h \ + ${D}${includedir}/GL/glxext.h + if [ "${BACKEND}" = "x11" ]; then + rm -f ${D}${libdir}/pkgconfig/gl.pc + fi +} + +do_install_append_imxgpu2d () { + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc } do_install_append_imxgpu2d () { -- 2.40.1