[OE-core] [oe-core 11/20] mesa: package gl/egl/osmesa to separate packages

[Koen Kooi]

Op 14 okt. 2011, om 13:19 heeft Martin Jansa het volgende geschreven:

> On Fri, Oct 14, 2011 at 12:12:11PM +0100, Richard Purdie wrote:
>> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
>>> * also install internal GL headers to libgl-dev
>>> 
>>> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
>>> ---
>>> meta/recipes-graphics/mesa/mesa-common.inc |   18 ++++++++++++++++--
>>> 1 files changed, 16 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
>>> index 89ef0cf..62d9b24 100644
>>> --- a/meta/recipes-graphics/mesa/mesa-common.inc
>>> +++ b/meta/recipes-graphics/mesa/mesa-common.inc
>>> @@ -40,7 +40,21 @@ require glx-use-tls.inc
>>> # Multiple virtual/gl providers being built breaks staging
>>> EXCLUDE_FROM_WORLD = "1"
>>> 
>>> -PACKAGES =+ "libglu libglu-dev"
>>> -
>>> +PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
>>> +FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
>>> +FILES_libgl = "${libdir}/libGL.so.*"
>>> FILES_libglu = "${libdir}/libGLU.so.*"
>>> +FILES_libosmesa = "${libdir}/libOSMesa.so.*"
>>> +
>>> +FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
>>> +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
>>> FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
>>> +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
>>> +
>>> +FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
>>> +FILES_libegl-dbg += "${libdir}/egl/.debug/*"
>>> +
>>> +do_install_append () {
>>> +    install -d ${D}/${includedir}/GL
>>> +    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
>>> +}
>> 
>> This last do_install_append is wrong. Things should only be using
>> installed header files, not internal uninstalled ones. If the need
>> anything else there is a bug. I know the intel video driver had issues
>> in this area but those were fixed in the driver.
> 
> checking from where we got this in meta-oe I've found really old commit
> http://git.openembedded.org/openembedded/commit/packages/mesa/mesa-common.inc?id=523eeb1062797a8562446fbefe9413a59540816b
> so you're right, I'll try to rebuild without this and drop this part
> from patchset.
> 
>> What other issues are people seeing without this piece?
> 
> Unless someone else knows about still broken driver :).


| glxdriswrast.c:39:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| glxdricommon.c:36:39: fatal error: GL/internal/dri_interface.h: No such file or directory
| compilation terminated.
| make[1]: *** [glxdricommon.lo] Error 1
| make[1]: *** Waiting for unfinished jobs....
| make[1]: *** [glxdriswrast.lo] Error 1
| make[1]: Leaving directory `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/xserver-xorg-2_1.11.1-r1/xorg-server-1.11.1/glx'

Xorg requires 'mesa-dri', which doesn't build anymore due to the COMPATIBLE_HOST :(