Merge lp:~schwann/gallery-app/gallery-startup-shader-fix into lp:gallery-app

[Günter Schwann]

Use OpenGLESv2 instead of OpenGL

Use OpenGLESv2 instead of OpenGL, as OpenGL is not used on the the device

[lp:~schwann/gallery-app/gallery-startup-shader-fix]

662. By Günter Schwann on 2013-05-02

Merge trunk

663. By Günter Schwann on 2013-05-02

Set changelog entry

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/108/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/121/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/109
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1391

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/122/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/110
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1393

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/123/rebuild

review: Needs Fixing (continuous-integration)

[lp:~schwann/gallery-app/gallery-startup-shader-fix]

664. By Günter Schwann on 2013-05-03

Merge trunk

665. By Günter Schwann on 2013-05-03

Use OpenGL on the desktop, and OpenGL ESv2 on the device

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1410

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/127/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/115
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1412

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/128/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/116
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/116
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1418

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/129/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/119

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/132/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/120

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/133/rebuild

review: Approve (continuous-integration)

[lp:~schwann/gallery-app/gallery-startup-shader-fix]

666. By Günter Schwann on 2013-05-03

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:666
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/124

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/137/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-15 17:22:42 +0000
+++ CMakeLists.txt	2013-05-03 22:24:24 +0000
@@ -31,7 +31,11 @@
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 find_package(Qt5Sql)
-find_package(OpenGL)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    find_package(GLESv2)
+else()
+    find_package(OpenGL)
+endif()
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(EXIV2 REQUIRED exiv2)

=== added file 'cmake/FindGLESv2.cmake'
--- cmake/FindGLESv2.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGLESv2.cmake	2013-05-03 22:24:24 +0000
@@ -0,0 +1,30 @@
+# - Try to find GLESv2
+# Once done this will define
+#  GLESv2_FOUND - System has GLESv2
+#  GLESv2_INCLUDE_DIRS - The GLESv2 include directories
+#  GLESv2_LIBRARIES - The libraries needed to use GLESv2
+
+find_package(PkgConfig)
+pkg_check_modules(PC_GLESv2 QUIET glesv2)
+
+find_path(GLESv2_INCLUDE_DIR GLES2/gl2.h
+          HINTS ${PC_GLESv2_INCLUDEDIR} ${PC_GLESv2_INCLUDE_DIRS})
+
+if (MIR_PLATFORM STREQUAL "android") 
+find_library(GLESv2_LIBRARY libGLESv2.so.2
+             HINTS /usr/lib/arm-linux-gnueabihf/libhybris-egl/)
+else()
+find_library(GLESv2_LIBRARY GLESv2
+             HINTS ${PC_GLESv2_LIBDIR} ${PC_GLESv2_LIBRARY_DIRS})
+endif()
+
+set(GLESv2_LIBRARIES ${GLESv2_LIBRARY})
+set(GLESv2_INCLUDE_DIRS ${GLESv2_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set GLESv2_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(GLESv2  DEFAULT_MSG
+                                  GLESv2_LIBRARY GLESv2_INCLUDE_DIR)
+
+mark_as_advanced(GLESv2_INCLUDE_DIR GLESv2_LIBRARY)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-03 17:22:44 +0000
+++ debian/changelog	2013-05-03 22:24:24 +0000
@@ -12,6 +12,7 @@
   * Fix cancel button in toolbar
   * Fix autopilot reveal and autopilot toolbar buttons click
   * Smaller default size on desktops
+  * Fix gallery startup on device (LP: #1173286)
 
  -- Didier Roche <[e-mail]>  Thu, 18 Apr 2013 09:52:45 +0200
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-04-15 12:05:00 +0000
+++ src/CMakeLists.txt	2013-05-03 22:24:24 +0000
@@ -112,9 +112,15 @@
 
 qt5_use_modules(${GALLERY} Widgets Core Qml Quick OpenGL Sql)
 
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    set(GL_LIBRARIES ${GLESv2_LIBRARIES})
+else()
+    set(GL_LIBRARIES ${OPENGL_LIBRARIES})
+endif()
+
 target_link_libraries( ${GALLERY}
     ${EXIV2_LIBRARIES}
-    ${OPENGL_LIBRARIES}
+    ${GL_LIBRARIES}
     ${GSTLIB_LDFLAGS}
     )
 

=== modified file 'tests/unittests/resource/CMakeLists.txt'
--- tests/unittests/resource/CMakeLists.txt	2013-04-15 12:05:00 +0000
+++ tests/unittests/resource/CMakeLists.txt	2013-05-03 22:24:24 +0000
@@ -26,7 +26,14 @@
     TIMEOUT ${CTEST_TESTING_TIMEOUT}
     ENVIRONMENT "QT_QPA_PLATFORM=minimal"
     )
+
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+    set(GL_LIBRARIES ${GLESv2_LIBRARIES})
+else()
+    set(GL_LIBRARIES ${OPENGL_LIBRARIES})
+endif()
+
 target_link_libraries(resource 
-    ${OPENGL_LIBRARIES}
+    ${GL_LIBRARIES}
     ${GSTLIB_LDFLAGS}
     )