[Merge] lp:~saiarcot895/ubuntu/utopic/openwalnut/armhf-fixes into lp:ubuntu/openwalnut

[Saikrishna Arcot]

Saikrishna Arcot has proposed merging lp:~saiarcot895/ubuntu/utopic/openwalnut/armhf-fixes into lp:ubuntu/openwalnut.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1363962 in openwalnut (Ubuntu): "[FFe] openwalnut fails to build on Utopic armhf"
  https://bugs.launchpad.net/ubuntu/+source/openwalnut/+bug/1363962

For more details, see:
https://code.launchpad.net/~saiarcot895/ubuntu/utopic/openwalnut/armhf-fixes/+merge/232879

The openwalnut package currently fails to build on Utopic armhf. This is partly because of a typedef conflict error between OpenSceneGraph and Qt4 and partly because of the use of a constant that is only present in OpenGL and OpenGL ES 1.x (not in OpenGL ES 2.0). For the first bug, an #include is added before all other includes to have the typedef and a #define assigned for it. For the second bug, that section of the code (which is the code that controls line smoothing) is excluded for armhf. While this means that openwalnut compiles, line-smoothing will not work. (I believe the proper way to do this in OpenGL ES 2.0 is to use multisampling.)

In addition, I added a patch that ensures that OpenGL ES is used if requested, and sets the libraries to link to to include OpenGL ES 2.0.
-- 
https://code.launchpad.net/~saiarcot895/ubuntu/utopic/openwalnut/armhf-fixes/+merge/232879
Your team Ubuntu branches is requested to review the proposed merge of lp:~saiarcot895/ubuntu/utopic/openwalnut/armhf-fixes into lp:ubuntu/openwalnut.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 7185 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140901/51347a71/attachment.diff>