mesa: remove egl, gles instead of using mesa-gl

4 files changed, 6 insertions, 36 deletions

diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf
index cf60d54..03d2d04 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -32,7 +32,7 @@ PREFERRED_PROVIDER_lxsession-lite_apalis-t30 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa-gl"
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index f1c7925..6696554 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -30,7 +30,7 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-t20 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa-gl"
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index 4d1a003..4b86235 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -32,7 +32,7 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-t30 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa-gl"
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 9481604..23b9af6 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,38 +1,8 @@
 # we use binary only EGL, GL ES1, GL ES2 drivers (package trdx-nv-binaries)
 # adapted from meta-fsl-arm/recipes-graphics/mesa/
 # FIXME: We may need to disable EGL, GL ES1 and GL ES2
-python __anonymous () {
-    import re
+PACKAGECONFIG_remove_tegra = "egl gles"
 
-    # SoC families to work on
-    families = ['tegra']
-    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)
+PROVIDES_remove_tegra = "virtual/libgles1 virtual/libgles2 virtual/egl"
 
-        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']
-        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'))
-}
+PACKAGE_ARCH = "${MACHINE_ARCH}"