From 770ad9302bb0196bbd9019c0dbd0ff0a3a16ab03 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 24 Jul 2013 09:15:10 -0300 Subject: mesa: Follow OE-Core update to 9.1.5 Change-Id: I875f74af849e0647a15a5b4ec4ad815848ef3a0a Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa_9.1.3.bbappend | 43 ------------------------------- recipes-graphics/mesa/mesa_9.1.5.bbappend | 43 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 recipes-graphics/mesa/mesa_9.1.3.bbappend create mode 100644 recipes-graphics/mesa/mesa_9.1.5.bbappend (limited to 'recipes-graphics/mesa') diff --git a/recipes-graphics/mesa/mesa_9.1.3.bbappend b/recipes-graphics/mesa/mesa_9.1.3.bbappend deleted file mode 100644 index 4b3b10b..0000000 --- a/recipes-graphics/mesa/mesa_9.1.3.bbappend +++ /dev/null @@ -1,43 +0,0 @@ -# FIXME: We may need to disable EGL, GL ES1 and GL ES2 -python __anonymous () { - import re - - # 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).split() - take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl'] - if 'mx6' in cur_soc_families.split(':'): - take_out.append('virtual/libgl') - 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')) -} - -# FIXME: Dirty hack to allow use of Vivante GPU libGL binary -do_install_append_mx6 () { - rm ${D}${libdir}/libGL.* -} diff --git a/recipes-graphics/mesa/mesa_9.1.5.bbappend b/recipes-graphics/mesa/mesa_9.1.5.bbappend new file mode 100644 index 0000000..4b3b10b --- /dev/null +++ b/recipes-graphics/mesa/mesa_9.1.5.bbappend @@ -0,0 +1,43 @@ +# FIXME: We may need to disable EGL, GL ES1 and GL ES2 +python __anonymous () { + import re + + # 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).split() + take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl'] + if 'mx6' in cur_soc_families.split(':'): + take_out.append('virtual/libgl') + 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')) +} + +# FIXME: Dirty hack to allow use of Vivante GPU libGL binary +do_install_append_mx6 () { + rm ${D}${libdir}/libGL.* +} -- cgit v1.2.3-54-g00ecf