From fcc843c90a6284d9510e0a68e770b50ef9b585d3 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 15 Mar 2013 19:22:56 -0300 Subject: [PATCH] mesa-dri: Don't build EGL, GL ES and GL ES2 librarioes The Vivante and AMD GPU drivers provide GPU specific libraries so we cannot build the same here or we'll end conflicting. Change-Id: I96e485a3e113612dfbb5902583fa71044bb0d035 Signed-off-by: Otavio Salvador --- .../mesa/mesa-dri_9.0.2.bbappend | 41 ++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/meta-fsl-arm/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend b/meta-fsl-arm/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend index 74738ffe..fe7685a8 100644 --- a/meta-fsl-arm/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend +++ b/meta-fsl-arm/recipes-graphics/mesa/mesa-dri_9.0.2.bbappend @@ -1,7 +1,38 @@ -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 3}" -PROVIDES_mx5 = "virtual/libgl" -PROVIDES_mx6 = "virtual/libgl" +# FIXME: We may need to disable EGL, GL ES1 and GL ES2 +python __anonymous () { + import re -PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" + # SoC families to work on + families = ['mx5', 'mx6'] + cur_soc_families = d.getVar('SOC_FAMILY', True) + if cur_soc_families and \ + any(map(lambda x: x in cur_soc_families.split(':'), families)): + # Remove egl gles1 and gles2 configure options + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ['--enable-egl', '--enable-gles1', '--enable-gles2'] + put_in = ['--disable-egl', '--disable-gles1', '--disable-gles2'] + pattern = re.compile("--with-egl-platforms") + new_extra_oeconf = [] + for i in extra_oeconf: + if i not in take_out and not pattern.match(i): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + + # Remove itens from provides + provides = d.getVar('PROVIDES', True) + take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl'] + new_provides = [] + for i in provides: + if i not in take_out: + new_provides.append(i) + + d.setVar('PROVIDES', ' '.join(new_provides)) + + # We are now machine specific + d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH')) +} -- 2.40.1