From e83a83d58bba5056075acc5b0b55253554594965 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 10 Jun 2013 14:08:32 -0700 Subject: mesa: sync up with oecore The mesa recipe from the oecore layer has been updated. This commit updates the .bbappend for the mesa recipe in this meta-intel layer to sync up with the oecore layer. Signed-off-by: Nitin A Kamble Signed-off-by: Tom Zanussi --- common/recipes-graphics/mesa/mesa_9.0.2.bbappend | 24 ------------------------ common/recipes-graphics/mesa/mesa_9.1.3.bbappend | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 common/recipes-graphics/mesa/mesa_9.0.2.bbappend create mode 100644 common/recipes-graphics/mesa/mesa_9.1.3.bbappend (limited to 'common') diff --git a/common/recipes-graphics/mesa/mesa_9.0.2.bbappend b/common/recipes-graphics/mesa/mesa_9.0.2.bbappend deleted file mode 100644 index b92831d3..00000000 --- a/common/recipes-graphics/mesa/mesa_9.0.2.bbappend +++ /dev/null @@ -1,24 +0,0 @@ - -# The emgd binary driver also provides egl, gles1, gles2 library & headers. -# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image -# is bundling the emgd driver. - -python __anonymous () { - import re - xserver = d.getVar('XSERVER', True) - if xserver and 'emgd-driver-bin' in xserver.split(' '): - 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)) - depends = d.getVar('DEPENDS', True) - d.setVar('DEPENDS', depends + " emgd-driver-bin") -} diff --git a/common/recipes-graphics/mesa/mesa_9.1.3.bbappend b/common/recipes-graphics/mesa/mesa_9.1.3.bbappend new file mode 100644 index 00000000..b92831d3 --- /dev/null +++ b/common/recipes-graphics/mesa/mesa_9.1.3.bbappend @@ -0,0 +1,24 @@ + +# The emgd binary driver also provides egl, gles1, gles2 library & headers. +# To avoid conflict disable egl, gles1, gles2 from meta-dri if the BSP image +# is bundling the emgd driver. + +python __anonymous () { + import re + xserver = d.getVar('XSERVER', True) + if xserver and 'emgd-driver-bin' in xserver.split(' '): + 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)) + depends = d.getVar('DEPENDS', True) + d.setVar('DEPENDS', depends + " emgd-driver-bin") +} -- cgit v1.2.3-54-g00ecf