Merge lp:~saiarcot895/ubuntu/utopic/openscenegraph/armhf-support into lp:ubuntu/utopic/openscenegraph

[Saikrishna Arcot]

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).

Note that OpenSceneGraph will still FTBFS, but will fail at a later point. This is because one of the examples uses freeglut, which still uses OpenGL. The option of building freeglut with OpenGL ES is still in the trunk and is expected to be released with version 3.0. While this example could be temporarily excluded, any application that uses both openscenegraph and freeglut will still FTBFS. The intention for this MP is so that when freetype 3.0 is released, only that package's packaging will have to be changed.

[Saikrishna Arcot (saiarcot895)]

In commit 42, there is a build error with regards to typedef'ing GLdouble if it isn't defined. Openscenegraph typedefs it to double, while Qt typedefs it to GLfloat (which will be a float). Because of this, a build error occurs. In addition, Qt uses checks if GLdouble is defined using #ifndef, which returns true (that it's not defined), since the typedef doesn't affect #defines.

[Daniel Holbach (dholbach)]

Fails to build: https://bugs.launchpad.net/ubuntu/+source/openscenegraph/+bug/1284190 (comment 6).

review: Needs Fixing

[Saikrishna Arcot (saiarcot895)]

(Copied from bug)

Something's odd there. Openscenegraph shouldn't be building with Qt5 in Ubuntu (although it is supported, IIRC). I take it this is not in a chroot?

[Daniel Holbach (dholbach)]

Thanks for pointing this out. This was in a chroot, where Qt5 was installed. I'll upload this to a test ppa which does armhf builds in a bit.

[Daniel Holbach (dholbach)]

https://code.launchpad.net/~ubuntu-sdk-team/+archive/ubuntu/testing/+build/6262021

[Saikrishna Arcot (saiarcot895)]

That is due to the freeglut dependency not yet supporting OpenGL ES and therefore giving an error (as mentioned in the 3rd paragraph of my description). It looks like freeglut is only used in the examples section, so I'm excluding that dependency for armhf.

QGIS and simgear (the library for flightgear) might build, but flightgear won't build until freeglut 3.0 is released.

[Daniel Holbach (dholbach)]

New build: https://code.launchpad.net/~ubuntu-sdk-team/+archive/ubuntu/testing/+build/6262744

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-17 16:52:38 +0000
+++ debian/changelog	2014-08-12 11:30:57 +0000
@@ -1,3 +1,14 @@
+openscenegraph (3.2.0~rc1-5.1ubuntu1) utopic; urgency=low
+
+  * 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
+
+ -- Saikrishna Arcot <[e-mail]>  Wed, 06 Aug 2014 17:41:46 -0500
+
 openscenegraph (3.2.0~rc1-5.1) unstable; urgency=low
 
   * Non-maintainer upload.

=== modified file 'debian/control'
--- debian/control	2014-05-17 16:52:38 +0000
+++ debian/control	2014-08-12 11:30:57 +0000
@@ -20,8 +20,10 @@
                libgdal-dev,
                libx11-dev,
                libxmu-dev,
-               freeglut3-dev,
-               libgl1-mesa-dev | libgl-dev,
+               freeglut3-dev [!armhf],
+               libgl1-mesa-dev [!armhf] | libgl-dev [!armhf],
+               libegl1-mesa-dev [armhf],
+               libgles2-mesa-dev [armhf],
                libxine2-dev,
                libavcodec-dev,
                libswscale-dev,

=== added file 'debian/patches/change-typedef.patch'
--- debian/patches/change-typedef.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/change-typedef.patch	2014-08-12 11:30:57 +0000
@@ -0,0 +1,13 @@
+Index: openscenegraph/OpenSceneGraph/include/osg/GL
+===================================================================
+--- openscenegraph.orig/OpenSceneGraph/include/osg/GL	2014-08-05 16:58:36.000000000 -0500
++++ openscenegraph/OpenSceneGraph/include/osg/GL	2014-08-06 06:45:29.857287930 -0500
+@@ -168,7 +168,7 @@
+ // add defines for OpenGL targets that don't define them, just to ease compatibility across targets
+ #ifndef GL_DOUBLE
+     #define GL_DOUBLE 0x140A
+-    typedef double GLdouble;
++    #define GLdouble double
+ #endif
+ 
+ #ifndef GL_INT

=== added file 'debian/patches/dont-build-osgframerenderer-on-gles.patch'
--- debian/patches/dont-build-osgframerenderer-on-gles.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/dont-build-osgframerenderer-on-gles.patch	2014-08-12 11:30:57 +0000
@@ -0,0 +1,24 @@
+Description: Don't build the osgframerenderer example if building for
+ OpenGL ES 1, OpenGL ES 2, or OpenGL 3. This is a portion of the full commit.
+Origin: upstream, https://github.com/openscenegraph/osg/commit/3f812e42c7bb257e1e19604318becd359d21f469
+
+Index: openscenegraph/OpenSceneGraph/examples/CMakeLists.txt
+===================================================================
+--- openscenegraph.orig/OpenSceneGraph/examples/CMakeLists.txt	2014-07-26 08:49:44.583787000 -0500
++++ openscenegraph/OpenSceneGraph/examples/CMakeLists.txt	2014-08-03 11:41:48.439983802 -0500
+@@ -46,7 +46,6 @@
+     ADD_SUBDIRECTORY(osgfont)
+     ADD_SUBDIRECTORY(osgforest)
+     ADD_SUBDIRECTORY(osgfxbrowser)
+-    ADD_SUBDIRECTORY(osgframerenderer)
+     ADD_SUBDIRECTORY(osgoutline)
+     ADD_SUBDIRECTORY(osggameoflife)
+     ADD_SUBDIRECTORY(osggeometry)
+@@ -173,6 +172,7 @@
+ 
+     IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
+         ADD_SUBDIRECTORY(osgscreencapture)
++        ADD_SUBDIRECTORY(osgframerenderer)
+         ADD_SUBDIRECTORY(osgmotionblur)
+         ADD_SUBDIRECTORY(osgteapot)
+     ENDIF()

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-05-17 16:52:38 +0000
+++ debian/patches/series	2014-08-12 11:30:57 +0000
@@ -6,3 +6,5 @@
 fix_for_multithreaded_vrml_loading
 osgDB_freetype.so_no_longer_built
 libav10.patch
+dont-build-osgframerenderer-on-gles.patch
+change-typedef.patch

=== modified file 'debian/rules'
--- debian/rules	2013-07-30 13:07:57 +0000
+++ debian/rules	2014-08-12 11:30:57 +0000
@@ -66,6 +66,16 @@
 
 LDFLAGS += -Wl,--as-needed
 
+ifeq (armhf,$(DEB_HOST_ARCH))
+EGL_LDFLAGS=$(shell pkg-config egl --libs)
+OPENGLES_LDFLAGS=$(shell pkg-config glesv2 --libs)
+ARMHF_DEFINES=-D OSG_GL1_AVAILABLE:BOOL=OFF \
+	-D OSG_GL2_AVAILABLE:BOOL=OFF \
+	-D OSG_GLES2_AVAILABLE:BOOL=ON \
+	-D OPENGL_gl_LIBRARY:STRING="${OPENGLES_LDFLAGS}" \
+	-D OPENGL_egl_LIBRARY:STRING="${EGL_LDFLAGS}"
+endif
+
 #
 # Shared libraries version numbers
 #
@@ -419,6 +429,7 @@
 		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
 		-D BUILD_OSG_EXAMPLES:BOOL=ON \
 		-D LIB_POSTFIX="" \
+		${ARMHF_DEFINES} \
 		../../${OSG}
 	${MAKE} ${PARALLEL_OPTIONS} VERBOSE=1 -C build/osg