Use instead, the special created recipe mesa-gl which provides on libgl. Change-Id: I5ed3c50a0a794f8ea63cc1906f0139ec47459fa6 Signed-off-by: Andrei Gherzan <and...@gherzan.ro> --- conf/machine/include/rpi-default-providers.inc | 2 ++ recipes-graphics/mesa/mesa_9.2.5.bbappend | 36 -------------------------- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 recipes-graphics/mesa/mesa_9.2.5.bbappend
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc index 3c5b294..ee3a3ac 100644 --- a/conf/machine/include/rpi-default-providers.inc +++ b/conf/machine/include/rpi-default-providers.inc @@ -5,4 +5,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-rpi" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "userland" PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl" PREFERRED_PROVIDER_jpeg = "jpeg" diff --git a/recipes-graphics/mesa/mesa_9.2.5.bbappend b/recipes-graphics/mesa/mesa_9.2.5.bbappend deleted file mode 100644 index 34da98f..0000000 --- a/recipes-graphics/mesa/mesa_9.2.5.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -PRINC := "${@int(PRINC) + 2}" - -# -# FIXME -# We need a way to disable EGL and GL ES2, these are provided by userland package -# -python __anonymous () { - import re - - 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) - 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)) - - # We are now machine specific - d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH')) -} -- 1.8.1.4 _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto