Merge lp:~mterry/platform-api/gles into lp:platform-api

[Michael Terry]

Add ubuntu/ui/config.h with UBUNTU_USE_GLES so we can know whether to include GLES2/gl2.h or GL/gl.h.

My understanding of the intricacies of GL headers is not deep. But it appears that you cannot use both GLES2 and normal GL headers at the same time. That is, GLES/gl2.h and GL/gl.h have conflicting definitions.

In Ubuntu, we want to use GLES2 on armhf, and GL everywhere else. Qt has solved this by using a configure-time flag to change the installed headers to use on or the other.

So here's a change to do the same for platform-api. It adds a new header, ubuntu/ui/config.h which contains UBUNTU_USE_GLES. If this is 1, GLES headers should be used. Otherwise, normal GL headers.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/platform-api-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/platform-api/gles]

49. By Michael Terry on 2013-04-10

add gl1 build-depends on non-armhf

50. By Michael Terry on 2013-04-10

add header boilerplate to config.h.in

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:49
http://jenkins.qa.ubuntu.com/job/platform-api-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/5/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:50
http://jenkins.qa.ubuntu.com/job/platform-api-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/6/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-03-20 12:49:06 +0000
+++ debian/control	2013-04-10 15:46:21 +0000
@@ -3,7 +3,8 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               libgles2-mesa-dev,
+               libgl1-mesa-dev[!armhf],
+               libgles2-mesa-dev[armhf],
                libhybris-dev,
 Standards-Version: 3.9.4
 Section: devel

=== modified file 'debian/rules'
--- debian/rules	2013-03-18 16:57:10 +0000
+++ debian/rules	2013-04-10 15:46:21 +0000
@@ -2,8 +2,18 @@
 
 DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
+gles2_architectures := armhf
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
+	use_gles=1
+else
+	use_gles=0
+endif
+
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DUSE_GLES=$(use_gles)
+
 overrid_dh_install:
 	dh_install --fail-missing

=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2013-02-05 06:58:40 +0000
+++ include/CMakeLists.txt	2013-04-10 15:46:21 +0000
@@ -1,1 +1,4 @@
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/ubuntu/ui/config.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu/ui/config.h DESTINATION include/ubuntu/ui)
+
 install(DIRECTORY ubuntu DESTINATION include)

=== added file 'include/config.h.in'
--- include/config.h.in	1970-01-01 00:00:00 +0000
+++ include/config.h.in	2013-04-10 15:46:21 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michael Terry <[e-mail]>
+ */
+
+#ifndef UBUNTU_UI_CONFIG_H_
+#define UBUNTU_UI_CONFIG_H_
+
+#define UBUNTU_USE_GLES @USE_GLES@
+
+#endif // UBUNTU_UI_CONFIG_H_

=== modified file 'include/ubuntu/ui/session_enumerator.h'
--- include/ubuntu/ui/session_enumerator.h	2013-02-20 05:24:03 +0000
+++ include/ubuntu/ui/session_enumerator.h	2013-04-10 15:46:21 +0000
@@ -21,8 +21,14 @@
 
 #include "ubuntu/platform/shared_ptr.h"
 #include "ubuntu/ui/well_known_applications.h"
+#include "ubuntu/ui/config.h"
 
+#if UBUNTU_USE_GLES
 #include <GLES2/gl2.h>
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
 
 namespace ubuntu
 {

=== modified file 'include/ubuntu/ui/ubuntu_ui_session_service.h'
--- include/ubuntu/ui/ubuntu_ui_session_service.h	2013-03-15 17:55:30 +0000
+++ include/ubuntu/ui/ubuntu_ui_session_service.h	2013-04-10 15:46:21 +0000
@@ -19,7 +19,14 @@
 #ifndef UBUNTU_UI_SESSION_SERVICE_C_API_H_
 #define UBUNTU_UI_SESSION_SERVICE_C_API_H_
 
+#include "ubuntu/ui/config.h"
+
+#if UBUNTU_USE_GLES
 #include <GLES2/gl2.h>
+#else
+#include <GL/gl.h>
+#include <GL/glext.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {

=== modified file 'src/android/CMakeLists.txt'
--- src/android/CMakeLists.txt	2013-02-06 00:32:45 +0000
+++ src/android/CMakeLists.txt	2013-04-10 15:46:21 +0000
@@ -7,6 +7,10 @@
 	${SOURCES}
 )
 
+include_directories(
+    ${CMAKE_BINARY_DIR}/include
+)
+
 target_link_libraries(
 	ubuntu_application_api
 	hybris_ics