Merge lp:~vanvugt/qtmir/fix-1401473 into lp:qtmir

[Daniel van Vugt]

Autodetect the correct OpenGL library if no preference was forced
(LP: #1401473).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/qtmir-ci/329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/62/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/329/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Just for some context, the whole reason for the current kludge is
1. Qt has a compile-time switch to support GL or GLES. Ubuntu has it packaged twice for x86/amd64, e.g. libqt5gui5 & libqt5gui5-gles

For armhf however, Qt is only packaged once, with GLES support only. So there, only libqt5gui5 is available. [*]

Usually x86/amd64 use GL, so the GLES packages have little use on that hardware. But there is one place GLES is needed: the emulator. This is the only place where -gles packages are actually used.

I recall we were unable to safely detect if the Qt install was compiled with GL or GLES, and relying on the existence of GL or GLES libraries didn't give us the right answer either. This may be better now, I can't say.

So, I'm placing the burden on you to test if this actually builds correctly in the emulator! You need to:
1. get emulator working [**], with dev env to build qtmir. You'll be working in there (else a chroot)
2. grab lp:qtmir/gles, and copy the debian/rules and debian/changelog on top of this branch.
3. build the branch, install and see if it works.

[*] this does imply Qt with OpenGL is impossible on arm.
[**] may be impossible currently due to https://bugs.launchpad.net/bugs/1458694

review: Needs Information

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:348
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/12/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:348
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/137/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1118
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1116
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1116/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1116/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1116
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1116/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1116/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1116
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1116/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1116/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/137/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

>1 year old. Rejecting

Unmerged revisions

348. By Daniel van Vugt on 2015-07-29

Prototype working fix

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-05-21 18:48:59 +0000
+++ CMakeLists.txt	2015-07-29 07:07:03 +0000
@@ -89,7 +89,7 @@
 # We expect this to be set via debian/rules for GLES builds
 if ("${USE_OPENGLES}" STREQUAL 1)
     message(STATUS "Qt5 determined to be compiled with GLES support")
-    pkg_check_modules(GLESv2 glesv2)
+    pkg_check_modules(GLESv2 glesv2 REQUIRED)
     add_definitions(-DQT_USING_GLES)
     include_directories (${GLESv2_INCLUDE_DIRS})
     set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
@@ -100,15 +100,25 @@
 # I suspect Mesa may allow it ~racarr.
 elseif("${USE_OPENGL_BUT_LINK_AGAINST_OPENGLES}")
     message(STATUS "Linking against OpenGL ES but binding OpenGL API")
-    pkg_check_modules(GLESv2 glesv2)
+    pkg_check_modules(GLESv2 glesv2 REQUIRED)
     add_definitions(-DQT_USING_GL)
     include_directories (${GLESv2_INCLUDE_DIRS})
     set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
 else()
-    message(STATUS "Qt5 determined to be compiled with OpenGL support")
     pkg_check_modules(GL gl)
-    add_definitions(-DQT_USING_OPENGL)
-    include_directories (${GL_INCLUDE_DIRS})
+    pkg_check_modules(GLESv2 glesv2)
+    if (GL_FOUND)
+        message(STATUS "Detected full OpenGL. Using that.")
+        add_definitions(-DQT_USING_GL)
+        include_directories (${GL_INCLUDE_DIRS})
+    elseif(GLESv2_FOUND)
+        message(STATUS "Detected OpenGL|ES v2. Using that.")
+        add_definitions(-DQT_USING_GLES)
+        include_directories (${GLESv2_INCLUDE_DIRS})
+        set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
+    else()
+        message(SEND_ERROR "No OpenGL support detected.")
+    endif()
 endif()
 
 # Standard install paths