Merge lp://staging/~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support into lp://staging/ubuntu/trusty/openscenegraph
| Status: | Approved | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Iain Lane | ||||||||
| Approved revision: | 41 | ||||||||
| Proposed branch: | lp://staging/~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support | ||||||||
| Merge into: | lp://staging/ubuntu/trusty/openscenegraph | ||||||||
| Diff against target: |
299 lines (+223/-4) 7 files modified
debian/changelog (+12/-0) debian/control (+8/-4) debian/patches/change-typedef.patch (+13/-0) debian/patches/dont-build-osgframerenderer-on-gles.patch (+24/-0) debian/patches/osgDB_freetype.so_no_longer_built (+152/-0) debian/patches/series (+3/-0) debian/rules (+11/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
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.
| Dmitry Shachnev (mitya57) wrote | # |
| Saikrishna Arcot (saiarcot895) wrote | # |
| Dmitry Shachnev (mitya57) wrote | # |
| Saikrishna Arcot (saiarcot895) wrote | # |
| Saikrishna Arcot (saiarcot895) wrote | # |
| Saikrishna Arcot (saiarcot895) wrote | # |
Unmerged revisions
- 41. By Saikrishna Arcot <email address hidden>
-
Fix Depends for libopenscenegra
ph-dev - 40. By Saikrishna Arcot <email address hidden>
-
Add patch to fix FreeType library detection (LP: #1339264).
- 39. By Saikrishna Arcot <email address hidden>
-
* Add support for building on armhf by building with OpenGL ES 2.0
(LP: #1284190).
* Backport part of a commit to not build osgframerenderer example.
* Add change-typedef. patch to fix conflicting typedefs for GLdouble
with OpenGL ES 2.0
* Exclude freeglut3-dev from dependencies for armhf
Thanks, uploaded to SRU review queue.