[Merge] lp:~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support into lp:ubuntu/trusty/openscenegraph

[Saikrishna Arcot]

The proposal to merge lp:~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support into lp:ubuntu/trusty/openscenegraph has been updated.

Description changed to:

Bug #1284190:
This adds support for building on Ubuntu armhf by building OpenSceneGraph with OpenGL ES 2.0. To do this, two build dependencies needed to be added: libegl1-mesa-dev and libgles2-mesa-dev. libgl1-mesa-dev isn't needed for OpenGL ES, and so it has been excluded from armhf.

In addition, a patch that changes the method of selecting what version of OpenGL/OpenGL ES contained a change that excluded one of the examples from being built under certain conditions. That part of the change is included here (as it would otherwise cause a build failure).

Finally, a typedef conflict for GLdouble between this package and Qt has been fixed in this merge as well.

Bug #1339264:
This fixes the freetype library detection, therefore allowing the freetype plugin to be built and for freetype support to be restored.

For more details, see:
https://code.launchpad.net/~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support/+merge/230835
-- 
https://code.launchpad.net/~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support/+merge/230835
Your team Ubuntu branches is requested to review the proposed merge of lp:~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support into lp:ubuntu/trusty/openscenegraph.