Mir

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

  1. fixing-libhybris-dependencies
  2. Merge into trunk
Proposed by Ricardo Salveti
Status: Merged
Approved by: Robert Ancell
Approved revision: no longer in the source branch.
Merged at revision: 932
Proposed branch: lp:~rsalveti/mir/fixing-libhybris-dependencies
Merge into: lp:~mir-team/mir/trunk
Diff against target: 124 lines (+23/-22)
4 files modified
cmake/FindEGL.cmake (+0/-5)
cmake/FindGLESv2.cmake (+0/-5)
debian/control (+1/-1)
tools/setup-partial-armhf-chroot.sh (+22/-11)
To merge this branch: bzr merge lp:~rsalveti/mir/fixing-libhybris-dependencies
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Thomas Voß Pending
Review via email: mp+178863@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Kevin DuBois (kdub) wrote :

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
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
10find_path(EGL_INCLUDE_DIR EGL/egl.h10find_path(EGL_INCLUDE_DIR EGL/egl.h
11 HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS})11 HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS})
1212
13if (MIR_PLATFORM STREQUAL "android")
14find_library(EGL_LIBRARY libEGL.so.1
15 HINTS /usr/lib/arm-linux-gnueabihf/libhybris-egl/)
16else()
17find_library(EGL_LIBRARY EGL13find_library(EGL_LIBRARY EGL
18 HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS})14 HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS})
19endif()
2015
21set(EGL_LIBRARIES ${EGL_LIBRARY})16set(EGL_LIBRARIES ${EGL_LIBRARY})
22set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})17set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR})
2318
=== 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 @@
10find_path(GLESv2_INCLUDE_DIR GLES2/gl2.h10find_path(GLESv2_INCLUDE_DIR GLES2/gl2.h
11 HINTS ${PC_GLESv2_INCLUDEDIR} ${PC_GLESv2_INCLUDE_DIRS})11 HINTS ${PC_GLESv2_INCLUDEDIR} ${PC_GLESv2_INCLUDE_DIRS})
1212
13if (MIR_PLATFORM STREQUAL "android")
14find_library(GLESv2_LIBRARY libGLESv2.so.2
15 HINTS /usr/lib/arm-linux-gnueabihf/libhybris-egl/)
16else()
17find_library(GLESv2_LIBRARY GLESv213find_library(GLESv2_LIBRARY GLESv2
18 HINTS ${PC_GLESv2_LIBDIR} ${PC_GLESv2_LIBRARY_DIRS})14 HINTS ${PC_GLESv2_LIBDIR} ${PC_GLESv2_LIBRARY_DIRS})
19endif()
2015
21set(GLESv2_LIBRARIES ${GLESv2_LIBRARY})16set(GLESv2_LIBRARIES ${GLESv2_LIBRARY})
22set(GLESv2_INCLUDE_DIRS ${GLESv2_INCLUDE_DIR})17set(GLESv2_INCLUDE_DIRS ${GLESv2_INCLUDE_DIR})
2318
=== 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 @@
26 libglm-dev,26 libglm-dev,
27 libprotobuf-dev,27 libprotobuf-dev,
28 pkg-config,28 pkg-config,
29 libhybris-dev [armhf],29 libhardware-dev [armhf],
30 libgoogle-glog-dev,30 libgoogle-glog-dev,
31 liblttng-ust-dev,31 liblttng-ust-dev,
32 libxkbcommon-dev,32 libxkbcommon-dev,
3333
=== 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 @@
50 libboost-date-time1.53-dev50 libboost-date-time1.53-dev
51 libboost-filesystem1.53-dev51 libboost-filesystem1.53-dev
52 libboost-program-options1.53-dev52 libboost-program-options1.53-dev
53 libprotobuf-dev
54 libboost-chrono1.53.053 libboost-chrono1.53.0
55 libboost-date-time1.53.054 libboost-date-time1.53.0
56 libboost-filesystem1.53.055 libboost-filesystem1.53.0
@@ -61,8 +60,9 @@
61 libboost-regex1.53-dev60 libboost-regex1.53-dev
62 libboost-regex1.53.061 libboost-regex1.53.0
63 libboost-program-options1.53.062 libboost-program-options1.53.0
64 libhybris63 libhardware2
65 libhybris-dev64 libhardware-dev
65 libhybris-common1
66 libandroid-properties166 libandroid-properties1
67 libgflags267 libgflags2
68 libgflags-dev68 libgflags-dev
@@ -71,8 +71,21 @@
71 libicu4871 libicu48
72 libprotobuf772 libprotobuf7
73 libprotobuf-dev73 libprotobuf-dev
74 libegl1-mesa
74 libegl1-mesa-dev75 libegl1-mesa-dev
76 libgles2-mesa
75 libgles2-mesa-dev77 libgles2-mesa-dev
78 libglapi-mesa
79 libffi6
80 libdrm2
81 libgbm1
82 libxau6
83 libxdmcp6
84 libx11-6
85 libx11-xcb1
86 libxcb1
87 libxcb-dri2-0
88 libxcb-xfixes0
76 libxkbcommon089 libxkbcommon0
77 libxkbcommon-dev90 libxkbcommon-dev
78 libumockdev-dev91 libumockdev-dev
@@ -81,11 +94,16 @@
81 libuuid194 libuuid1
82 liblttng-ust-dev95 liblttng-ust-dev
83 liburcu-dev96 liburcu-dev
97 libudev1
98 libwayland-client0
99 libwayland-server0
84 uuid-dev100 uuid-dev
85 systemtap-sdt-dev101 systemtap-sdt-dev
86 zlib1g)102 zlib1g)
87103
88 declare -a PACKAGES_ALL=(libglm-dev)104 declare -a PACKAGES_ALL=(
105 android-platform-headers
106 libglm-dev)
89107
90 #cleanup108 #cleanup
91 for i in * ; do109 for i in * ; do
@@ -97,11 +115,4 @@
97115
98 download_and_extract_packages PACKAGES_ARMHF armhf116 download_and_extract_packages PACKAGES_ARMHF armhf
99 download_and_extract_packages PACKAGES_ALL all117 download_and_extract_packages PACKAGES_ALL all
100
101 #todo: we get egl/gles headers from the mesa packages, but should be pointing at the hybris libraries
102 #just rewrite the symlinks for now
103 rm ./usr/lib/arm-linux-gnueabihf/libEGL.so
104 rm ./usr/lib/arm-linux-gnueabihf/libGLESv2.so
105 ln -s libhybris-egl/libEGL.so.1 ./usr/lib/arm-linux-gnueabihf/libEGL.so
106 ln -s libhybris-egl/libGLESv2.so.2 ./usr/lib/arm-linux-gnueabihf/libGLESv2.so
107popd > /dev/null 118popd > /dev/null

Subscribers

People subscribed via source and target branches