Patchwork [meta-fsl-arm] fix mesa version

login
register
mail settings
Submitter pighi@selea.com
Date Feb. 26, 2014, 9:05 a.m.
Message ID <201402260905.s1Q95hFq029705@vivaldi29.register.it>
Download mbox | patch
Permalink /patch/67461/
State Superseded
Delegated to: Otavio Salvador
Headers show

Comments

pighi@selea.com - Feb. 26, 2014, 9:05 a.m.
Signed-off-by: Omar Yocto
---
recipes-graphics/mesa/mesa_9.2.2.bbappend | 40 -------------------------------
recipes-graphics/mesa/mesa_9.2.5.bbappend | 40 +++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 40 deletions(-)
delete mode 100644 recipes-graphics/mesa/mesa_9.2.2.bbappend
create mode 100644 recipes-graphics/mesa/mesa_9.2.5.bbappend
Otavio Salvador - Feb. 26, 2014, 6:51 p.m.
Hello,

On Wed, Feb 26, 2014 at 6:05 AM, pighi@selea.com <pighi@selea.com> wrote:
> Signed-off-by: Omar Yocto

The commiter name must to be right; it lacks the e-mail address and
does your surname is really Yocto? ;-)

> ---
> recipes-graphics/mesa/mesa_9.2.2.bbappend | 40 -------------------------------
> recipes-graphics/mesa/mesa_9.2.5.bbappend | 40 +++++++++++++++++++++++++++++++

This has been fixed in master some days ago[1] please update your tree
and check.

1. http://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/commit/?id=9621bdb3f905852e7490b2b5a8b481e51ea154c7

Patch

diff --git a/recipes-graphics/mesa/mesa_9.2.2.bbappend b/recipes-graphics/mesa/mesa_9.2.2.bbappend
deleted file mode 100644
index 9975abc..0000000
--- a/recipes-graphics/mesa/mesa_9.2.2.bbappend
+++ /dev/null
@@ -1,40 +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))
-}
-
-# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
-do_install_append_mx6 () {
- rm -f ${D}${libdir}/libGL.*
-}
diff --git a/recipes-graphics/mesa/mesa_9.2.5.bbappend b/recipes-graphics/mesa/mesa_9.2.5.bbappend
new file mode 100644
index 0000000..9975abc
--- /dev/null
+++ b/recipes-graphics/mesa/mesa_9.2.5.bbappend
@@ -0,0 +1,40 @@ 
+# 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))
+}
+
+# FIXME: Dirty hack to allow use of Vivante GPU libGL binary
+do_install_append_mx6 () {
+ rm -f ${D}${libdir}/libGL.*
+}