helium-3rd-party/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi synced 2026-10-02 17:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesa: Replace ugly fix for gles/egl

Browse Source 
Use instead, the special created recipe mesa-gl which provides on libgl.

Change-Id: I5ed3c50a0a794f8ea63cc1906f0139ec47459fa6
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
This commit is contained in:
Andrei Gherzan 2014-02-25 13:49:40 +02:00
parent 9d626df7b8
commit bdb6b72284
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/include/rpi-default-providers.inc
View File

@ -5,4 +5,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-rpi"
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
PREFERRED_PROVIDER_virtual/egl ?= "userland" PREFERRED_PROVIDER_virtual/egl ?= "userland"
PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
PREFERRED_PROVIDER_jpeg = "jpeg" PREFERRED_PROVIDER_jpeg = "jpeg"

36
recipes-graphics/mesa/mesa_9.2.5.bbappend
View File

@ -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'))
}