Merge lp:~rsalveti/mir/fixing-libhybris-dependencies into lp:~mir-team/mir/trunk

[Ricardo Salveti]

Just use libhardware instead of libhybris when building mir (avoid conflicts with egl/gles)

Just use libhardware instead of libhybris when building mir (avoid conflicts with egl/gles)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:932
http://jenkins.qa.ubuntu.com/job/mir-ci/1224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1616/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1501
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/462/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1224/rebuild

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

looks good to me, if we can get this past jenkins. :) it will likely take some tinkering with this cmake file to find the libraries in the cross build. i can try teaching cmake to find the files somehow else for a bit tomorrow

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:933
http://jenkins.qa.ubuntu.com/job/mir-ci/1226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1618/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/464
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/464/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1226/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:934
http://jenkins.qa.ubuntu.com/job/mir-ci/1227/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1619/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/465
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/465/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1227/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:935
http://jenkins.qa.ubuntu.com/job/mir-ci/1228/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1620/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/466
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/466/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1228/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:936
http://jenkins.qa.ubuntu.com/job/mir-ci/1229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1621/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/467
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/467/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1229/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:937
http://jenkins.qa.ubuntu.com/job/mir-ci/1231/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1508
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/469
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/469/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1231/rebuild

review: Approve (continuous-integration)

=== modified file 'cmake/FindEGL.cmake'
--- cmake/FindEGL.cmake	2013-01-15 19:30:28 +0000
+++ cmake/FindEGL.cmake	2013-08-07 03:45:36 +0000
@@ -10,13 +10,8 @@
 find_path(EGL_INCLUDE_DIR EGL/egl.h
           HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS})
 
-if (MIR_PLATFORM STREQUAL "android") 
-find_library(EGL_LIBRARY libEGL.so.1
-             HINTS /usr/lib/arm-linux-gnueabihf/libhybris-egl/)
-else()
 find_library(EGL_LIBRARY EGL
              HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS})
-endif()
 
 set(EGL_LIBRARIES ${EGL_LIBRARY})
 set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})

=== modified file 'cmake/FindGLESv2.cmake'
--- cmake/FindGLESv2.cmake	2013-01-15 19:30:28 +0000
+++ cmake/FindGLESv2.cmake	2013-08-07 03:45:36 +0000
@@ -10,13 +10,8 @@
 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})

=== modified file 'debian/control'
--- debian/control	2013-08-03 01:36:16 +0000
+++ debian/control	2013-08-07 03:45:36 +0000
@@ -26,7 +26,7 @@
                libglm-dev,
                libprotobuf-dev,
                pkg-config,
-               libhybris-dev [armhf],
+               libhardware-dev [armhf],
                libgoogle-glog-dev,
                liblttng-ust-dev,
                libxkbcommon-dev,

=== modified file 'tools/setup-partial-armhf-chroot.sh'
--- tools/setup-partial-armhf-chroot.sh	2013-07-10 18:36:28 +0000
+++ tools/setup-partial-armhf-chroot.sh	2013-08-07 03:45:36 +0000
@@ -50,7 +50,6 @@
         libboost-date-time1.53-dev
         libboost-filesystem1.53-dev
         libboost-program-options1.53-dev
-        libprotobuf-dev
         libboost-chrono1.53.0
         libboost-date-time1.53.0
         libboost-filesystem1.53.0
@@ -61,8 +60,9 @@
         libboost-regex1.53-dev
         libboost-regex1.53.0
         libboost-program-options1.53.0
-        libhybris
-        libhybris-dev
+        libhardware2
+        libhardware-dev
+        libhybris-common1
         libandroid-properties1
         libgflags2
         libgflags-dev
@@ -71,8 +71,21 @@
         libicu48
         libprotobuf7
         libprotobuf-dev
+        libegl1-mesa
         libegl1-mesa-dev
+        libgles2-mesa
         libgles2-mesa-dev
+        libglapi-mesa
+        libffi6
+        libdrm2
+        libgbm1
+        libxau6
+        libxdmcp6
+        libx11-6
+        libx11-xcb1
+        libxcb1
+        libxcb-dri2-0
+        libxcb-xfixes0
         libxkbcommon0
         libxkbcommon-dev
         libumockdev-dev
@@ -81,11 +94,16 @@
         libuuid1
         liblttng-ust-dev
         liburcu-dev
+        libudev1
+        libwayland-client0
+        libwayland-server0
         uuid-dev
         systemtap-sdt-dev
         zlib1g)
 
-    declare -a PACKAGES_ALL=(libglm-dev)
+    declare -a PACKAGES_ALL=(
+        android-platform-headers
+        libglm-dev)
 
     #cleanup
     for i in * ; do
@@ -97,11 +115,4 @@
 
     download_and_extract_packages PACKAGES_ARMHF armhf
     download_and_extract_packages PACKAGES_ALL all
-
-    #todo: we get egl/gles headers from the mesa packages, but should be pointing at the hybris libraries
-    #just rewrite the symlinks for now
-    rm ./usr/lib/arm-linux-gnueabihf/libEGL.so 
-    rm ./usr/lib/arm-linux-gnueabihf/libGLESv2.so 
-    ln -s libhybris-egl/libEGL.so.1 ./usr/lib/arm-linux-gnueabihf/libEGL.so 
-    ln -s libhybris-egl/libGLESv2.so.2 ./usr/lib/arm-linux-gnueabihf/libGLESv2.so
 popd > /dev/null