From 40267fd013085cad09404314dcc27f6cc1772504 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 12 Nov 2013 00:12:36 +0200 Subject: mesa: Remove egl and gles only for raspberrypi machine Change-Id: I25fab6e100546cfffdd901383f76de76cd7763ed Signed-off-by: Andrei Gherzan --- recipes-graphics/mesa/mesa_9.2.2.bbappend | 48 ++++++++++++++++--------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/recipes-graphics/mesa/mesa_9.2.2.bbappend b/recipes-graphics/mesa/mesa_9.2.2.bbappend index 88e5eab..34da98f 100644 --- a/recipes-graphics/mesa/mesa_9.2.2.bbappend +++ b/recipes-graphics/mesa/mesa_9.2.2.bbappend @@ -1,34 +1,36 @@ -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" # # FIXME -# We may a way to disable EGL and GL ES2, these are provided by userland package +# We need a way to disable EGL and GL ES2, these are provided by userland package # python __anonymous () { import re - # Remove egl and gles2 configure options - extra_oeconf = d.getVar('EXTRA_OECONF', True).split() - take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1'] - put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1'] - 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): + machine = d.getVar('MACHINE', True) + if machine == 'raspberrypi': + # Remove egl and gles2 configure options + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ['--enable-egl', '--enable-gles2', '--enable-gles1'] + put_in = ['--disable-egl', '--disable-gles2', '--disable-gles1'] + 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) - for i in put_in: - new_extra_oeconf.append(i) - d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) - # Remove egl and gles2 from provides - provides = d.getVar('PROVIDES', True).split() - take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1'] - new_provides = [] - for i in provides: - if i not in take_out: - new_provides.append(i) - d.setVar('PROVIDES', ' '.join(new_provides)) + # Remove egl and gles2 from provides + provides = d.getVar('PROVIDES', True).split() + take_out = ['virtual/libgles2', 'virtual/egl', 'virtual/libgles1'] + 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')) + # We are now machine specific + d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH')) } -- cgit v1.2.3-54-g00ecf