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

[Andreas Pokorny]

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2403
http://jenkins.qa.ubuntu.com/job/mir-ci/4724/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3734/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2645/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3684/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/873/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3684/console

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2404
http://jenkins.qa.ubuntu.com/job/mir-ci/4727/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3741/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3691/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3691/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

(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)]

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)]

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)]

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)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4732/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3746/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/167/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2657/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3696/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/881/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3696/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4740/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3755/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2666/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3705/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/889/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3705/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4745/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3760/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2671/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/894/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3710/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4750/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3765/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2676/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3715/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3715/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4754/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3769/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2680/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3719/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/903/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3719/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2405
http://jenkins.qa.ubuntu.com/job/mir-ci/4758/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3774/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2685/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3724/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/908/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3724/console

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

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)]

FAILED: Continuous integration, rev:2407
http://jenkins.qa.ubuntu.com/job/mir-ci/4898/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3970/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3912/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1048/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3913/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2408
http://jenkins.qa.ubuntu.com/job/mir-ci/4899/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3971/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2878/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3913/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1049/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3914/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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)]

OK

review: Approve

[Alexandros Frantzis (afrantzis)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1899/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4089/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4031/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4032/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'cmake/ABICheck.cmake'
--- cmake/ABICheck.cmake	2015-09-08 21:22:41 +0000
+++ cmake/ABICheck.cmake	2015-09-22 18:46:53 +0000
@@ -89,6 +89,7 @@
 make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
 make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
 endif()
+make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
 
 add_custom_target(abi-release-dump
   COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
@@ -125,7 +126,7 @@
   )
 endmacro(_define_abi_check_for)
 
-set(the_libs mirserver mirclient mircommon mirplatform mircookie)
+set(the_libs mirserver mirclient mircommon mirplatform mircookie mirplatforminputevdev)
 if(MIR_BUILD_PLATFORM_MESA_KMS)
   set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
 endif()

=== modified file 'debian/control'
--- debian/control	2015-09-22 13:50:47 +0000
+++ debian/control	2015-09-22 18:46:53 +0000
@@ -331,6 +331,20 @@
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Android drivers.
 
+Package: mir-platform-input-evdev2
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Display server for Ubuntu - input platform library
+ Mir is a display server running on linux systems, with a focus on efficiency,
+ robust operation and a well-defined driver model.
+ .
+ Contains the shared libraries required for the Mir server to interact with
+ the input hardware using the evdev interface.
+
 Package: mir-client-platform-mesa3
 Section: libs
 Architecture: linux-any

=== added file 'debian/mir-platform-input-evdev2.install'
--- debian/mir-platform-input-evdev2.install	1970-01-01 00:00:00 +0000
+++ debian/mir-platform-input-evdev2.install	2015-09-22 18:46:53 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/mir/server-platform/input-evdev.so.2

=== modified file 'src/platforms/evdev/CMakeLists.txt'
--- src/platforms/evdev/CMakeLists.txt	2015-09-10 13:39:03 +0000
+++ src/platforms/evdev/CMakeLists.txt	2015-09-22 18:46:53 +0000
@@ -29,6 +29,7 @@
   OUTPUT_NAME input-evdev
   LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
   PREFIX ""
+  SUFFIX ".so.${MIR_SERVER_INPUT_PLATFORM_ABI}"
   LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${MIR_INPUT_PLATFORM_VERSION_SCRIPT}"
 )
 
@@ -38,3 +39,5 @@
   ${Boost_PROGRAM_OPTIONS_LIBRARY}
   ${LIBINPUT_LDFLAGS} ${LIBINPUT_LIBRARIES}
 )
+
+install(TARGETS mirplatforminputevdev LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})

=== modified file 'tools/run_abi_compliance_checker.sh'
--- tools/run_abi_compliance_checker.sh	2015-06-05 06:28:36 +0000
+++ tools/run_abi_compliance_checker.sh	2015-09-22 18:46:53 +0000
@@ -9,7 +9,8 @@
     ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
     ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
     ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
-    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
+    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
+    ["mirplatforminputevdev"]="MIR_SERVER_INPUT_PLATFORM_ABI" )
 
 print_help_and_exit()
 {

=== modified file 'tools/update_package_abis.sh'
--- tools/update_package_abis.sh	2015-09-08 21:22:41 +0000
+++ tools/update_package_abis.sh	2015-09-22 18:46:53 +0000
@@ -21,7 +21,8 @@
     mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
     mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
     mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
-    mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI"
+    mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
+    mir-platform-input-evdev:MIR_SERVER_INPUT_PLATFORM_ABI"
 
 package_name()
 {