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
89
make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
89
make_lib_descriptor(clientplatformandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/src/include/client/mir/client_platform_factory.h)
6
90
make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
90
make_lib_descriptor(platformgraphicsandroid LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/graphics/platform.h)
7
91
endif()
91
endif()
8
92
make_lib_descriptor(platforminputevdev LIBRARY_HEADER ${CMAKE_SOURCE_DIR}/include/platform/mir/input/)
9
92
93
10
93
add_custom_target(abi-release-dump
94
add_custom_target(abi-release-dump
11
94
  COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
95
  COMMAND /bin/sh -c '${CMAKE_SOURCE_DIR}/tools/generate-abi-base-dump.sh ${CMAKE_SOURCE_DIR}'
12
@@ -125,7 +126,7 @@
13
125
  )
126
  )
14
126
endmacro(_define_abi_check_for)
127
endmacro(_define_abi_check_for)
15
127
128
17
128
set(the_libs mirserver mirclient mircommon mirplatform mircookie)
129
set(the_libs mirserver mirclient mircommon mirplatform mircookie mirplatforminputevdev)
18
129
if(MIR_BUILD_PLATFORM_MESA_KMS)
130
if(MIR_BUILD_PLATFORM_MESA_KMS)
19
130
  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
131
  set(the_libs ${the_libs} mirclientplatformmesa mirplatformgraphicsmesakms)
20
131
endif()
132
endif()
21
132
133
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
331
 Contains the shared libraries required for the Mir server to interact with
331
 Contains the shared libraries required for the Mir server to interact with
27
332
 the hardware platform using the Android drivers.
332
 the hardware platform using the Android drivers.
28
333
333
29
334
Package: mir-platform-input-evdev2
30
335
Section: libs
31
336
Architecture: linux-any
32
337
Multi-Arch: same
33
338
Pre-Depends: ${misc:Pre-Depends}
34
339
Depends: ${misc:Depends},
35
340
         ${shlibs:Depends},
36
341
Description: Display server for Ubuntu - input platform library
37
342
 Mir is a display server running on linux systems, with a focus on efficiency,
38
343
 robust operation and a well-defined driver model.
39
344
 .
40
345
 Contains the shared libraries required for the Mir server to interact with
41
346
 the input hardware using the evdev interface.
42
347
43
334
Package: mir-client-platform-mesa3
348
Package: mir-client-platform-mesa3
44
335
Section: libs
349
Section: libs
45
336
Architecture: linux-any
350
Architecture: linux-any
46
337
351
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
1
usr/lib/*/mir/server-platform/input-evdev.so.2
52
0
2
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
29
  OUTPUT_NAME input-evdev
29
  OUTPUT_NAME input-evdev
58
30
  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
30
  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/server-modules
59
31
  PREFIX ""
31
  PREFIX ""
60
32
  SUFFIX ".so.${MIR_SERVER_INPUT_PLATFORM_ABI}"
61
32
  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${MIR_INPUT_PLATFORM_VERSION_SCRIPT}"
33
  LINK_FLAGS "-Wl,--exclude-libs=ALL -Wl,--version-script,${MIR_INPUT_PLATFORM_VERSION_SCRIPT}"
62
33
)
34
)
63
34
35
64
@@ -38,3 +39,5 @@
65
38
  ${Boost_PROGRAM_OPTIONS_LIBRARY}
39
  ${Boost_PROGRAM_OPTIONS_LIBRARY}
66
39
  ${LIBINPUT_LDFLAGS} ${LIBINPUT_LIBRARIES}
40
  ${LIBINPUT_LDFLAGS} ${LIBINPUT_LIBRARIES}
67
40
)
41
)
68
42
69
43
install(TARGETS mirplatforminputevdev LIBRARY DESTINATION ${MIR_SERVER_PLATFORM_PATH})
70
41
44
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
9
    ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
9
    ["mirclientplatformandroid"]="MIR_CLIENT_PLATFORM_ABI" \
76
10
    ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
10
    ["mirclientplatformmesa"]="MIR_CLIENT_PLATFORM_ABI" \
77
11
    ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
11
    ["mirplatformgraphicsandroid"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
79
12
    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" )
12
    ["mirplatformgraphicsmesakms"]="MIR_SERVER_GRAPHICS_PLATFORM_ABI" \
80
13
    ["mirplatforminputevdev"]="MIR_SERVER_INPUT_PLATFORM_ABI" )
81
13
14
82
14
print_help_and_exit()
15
print_help_and_exit()
83
15
{
16
{
84
16
17
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
21
    mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
21
    mir-client-platform-mesa:MIR_CLIENT_PLATFORM_ABI \
90
22
    mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
22
    mir-platform-graphics-android:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
91
23
    mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
23
    mir-platform-graphics-mesa-x:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
93
24
    mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI"
24
    mir-platform-graphics-mesa-kms:MIR_SERVER_GRAPHICS_PLATFORM_ABI \
94
25
    mir-platform-input-evdev:MIR_SERVER_INPUT_PLATFORM_ABI"
95
25
26
96
26
package_name()
27
package_name()
97
27
{
28
{
Status:	Merged
Approved by:	Andreas Pokorny on 2015-09-22
Approved revision:	no longer in the source branch.
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	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