Mir

Merge lp:~andreas-pokorny/mir/libinput-package into lp:mir

  1. libinput-package
  2. Merge into development-branch
Proposed by Andreas Pokorny on 2015-08-28
Status: Merged
Approved by: Andreas Pokorny on 2015-09-22
Approved revision: 2410
Merged at revision: 2960
Proposed branch: lp:~andreas-pokorny/mir/libinput-package
Merge into: lp:mir
Prerequisite: lp:~andreas-pokorny/mir/libinput-platform
Diff against target: 97 lines (+24/-3)
6 files modified
cmake/ABICheck.cmake (+2/-1)
debian/control (+14/-0)
debian/mir-platform-input-evdev2.install (+1/-0)
src/platforms/evdev/CMakeLists.txt (+3/-0)
tools/run_abi_compliance_checker.sh (+2/-1)
tools/update_package_abis.sh (+2/-1)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/libinput-package
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-09-23
Alexandros Frantzis (community) Approve on 2015-09-17
Alan Griffiths Approve on 2015-09-16
Daniel van Vugt Approve on 2015-09-01
Kevin DuBois (community) 2015-08-28 Approve on 2015-08-28
Review via email: mp+269534@code.launchpad.net

Commit Message

install libinput as a versioned driver package and enable ABI trace dump generation

Description of the Change

extends the debian settings and cmake to install as input-evdev.so.2

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

(1) Needs fixing per above:

/mir/src/platforms/evdev/libinput_device.cpp:332:53: error: 'libinput_device_get_device_group' was not declared in this scope
     return libinput_device_get_device_group(device());
                                                     ^

/mir/src/platforms/evdev/libinput_device.cpp:332:12: error: use of undeclared identifier 'libinput_device_get_device_group'
    return libinput_device_get_device_group(device());
           ^

(2) Needs information: What's this?;
46 - ${Boost_PROGRAM_OPTIONS_LIBRARY}
47 + ${Boost_PROGRAM_OPTIONS_LIBRARY}G

review: Needs Information
Andreas Pokorny (andreas-pokorny) wrote :

Yes, the group handling I am using was only added in 0.12. The silo for vivid+overlay is on the way to get 0.22 + touchscreen patches into the phone ppa.

Daniel van Vugt (vanvugt) wrote :

Approved pending Jenkins. This one (or rather the prerequisite) should not land till Jenkins is back online and has tested it.

review: Approve
Daniel van Vugt (vanvugt) wrote :

Also nit: Instead of:

39 + SUFFIX ".so.${MIR_SERVER_INPUT_PLATFORM_ABI}"

You should set the target property "SOVERSION" to "${MIR_SERVER_INPUT_PLATFORM_ABI}".

Because the SOVERSION ABI string isn't just part of the file name, but a property that the linker bakes into the binary.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Alexandros Frantzis (afrantzis) wrote :

3: Unknown package: debian/control contains versioned package mir-platform-input-evdev but it is unknown to this script
3: The package list in this script needs to be updated

review: Needs Fixing
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2409
http://jenkins.qa.ubuntu.com/job/mir-ci/4900/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3972
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3914
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1050
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1050/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3915
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3915/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6630
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23318

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

review: Approve (continuous-integration)
Alan Griffiths (alan-griffiths) wrote :

OK

review: Approve
Alexandros Frantzis (afrantzis) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~andreas-pokorny/mir/libinput-package updated on 2015-09-22
2410. By Andreas Pokorny on 2015-09-22

merge lp:mir

PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/ABICheck.cmake'
2--- cmake/ABICheck.cmake 2015-09-08 21:22:41 +0000
3+++ cmake/ABICheck.cmake 2015-09-22 18:46:53 +0000
4@@ -89,6 +89,7 @@
5 make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
6 make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
7 endif()
8+make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
9
10 add_custom_target(abi-release-dump
11 COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
12@@ -125,7 +126,7 @@
13 )
14 endmacro(_define_abi_check_for)
15
16-set(the_libs mirserver mirclient mircommon mirplatform mircookie)
17+set(the_libs mirserver mirclient mircommon mirplatform mircookie mirplatforminputevdev)
18 if(MIR_BUILD_PLATFORM_MESA_KMS)
19 set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
20 endif()
21
22=== modified file 'debian/control'
23--- debian/control 2015-09-22 13:50:47 +0000
24+++ debian/control 2015-09-22 18:46:53 +0000
25@@ -331,6 +331,20 @@
26 Contains the shared libraries required for the Mir server to interact with
27 the hardware platform using the Android drivers.
28
29+Package: mir-platform-input-evdev2
30+Section: libs
31+Architecture: linux-any
32+Multi-Arch: same
33+Pre-Depends: ${misc:Pre-Depends}
34+Depends: ${misc:Depends},
35+ ${shlibs:Depends},
36+Description: Display server for Ubuntu - input platform library
37+ Mir is a display server running on linux systems, with a focus on efficiency,
38+ robust operation and a well-defined driver model.
39+ .
40+ Contains the shared libraries required for the Mir server to interact with
41+ the input hardware using the evdev interface.
42+
43 Package: mir-client-platform-mesa3
44 Section: libs
45 Architecture: linux-any
46
47=== added file 'debian/mir-platform-input-evdev2.install'
48--- debian/mir-platform-input-evdev2.install 1970-01-01 00:00:00 +0000
49+++ debian/mir-platform-input-evdev2.install 2015-09-22 18:46:53 +0000
50@@ -0,0 +1,1 @@
51+usr/lib/*/mir/server-platform/input-evdev.so.2
52
53=== modified file 'src/platforms/evdev/CMakeLists.txt'
54--- src/platforms/evdev/CMakeLists.txt 2015-09-10 13:39:03 +0000
55+++ src/platforms/evdev/CMakeLists.txt 2015-09-22 18:46:53 +0000
56@@ -29,6 +29,7 @@
57 OUTPUT_NAME input-evdev
58 LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
59 PREFIX ""
60+ SUFFIX ".so.${MIR_SERVER_INPUT_PLATFORM_ABI}"
61 LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${MIR_INPUT_PLATFORM_VERSION_SCRIPT}"
62 )
63
64@@ -38,3 +39,5 @@
65 ${Boost_PROGRAM_OPTIONS_LIBRARY}
66 ${LIBINPUT_LDFLAGS} ${LIBINPUT_LIBRARIES}
67 )
68+
69+install(TARGETS mirplatforminputevdev LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
70
71=== modified file 'tools/run_abi_compliance_checker.sh'
72--- tools/run_abi_compliance_checker.sh 2015-06-05 06:28:36 +0000
73+++ tools/run_abi_compliance_checker.sh 2015-09-22 18:46:53 +0000
74@@ -9,7 +9,8 @@
75 ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
76 ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
77 ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
78- ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
79+ ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
80+ ["mirplatforminputevdev"]="MIR_SERVER_INPUT_PLATFORM_ABI" )
81
82 print_help_and_exit()
83 {
84
85=== modified file 'tools/update_package_abis.sh'
86--- tools/update_package_abis.sh 2015-09-08 21:22:41 +0000
87+++ tools/update_package_abis.sh 2015-09-22 18:46:53 +0000
88@@ -21,7 +21,8 @@
89 mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
90 mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
91 mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
92- mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI"
93+ mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
94+ mir-platform-input-evdev:MIR_SERVER_INPUT_PLATFORM_ABI"
95
96 package_name()
97 {

Subscribers

People subscribed via source and target branches