From 595beb93b43b0f3ab40e9a5e02b8d8b9e4487503 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Mar 2015 15:36:35 +1000 Subject: [PATCH 1/3] Drop libinput_device_has_button And merge all current API versions into the same block. This isn't technically necessary since removing libinput_has_button from the code will remove it from the exported list. That trips up test/symbols-leak-test though. Since we break the API and bump the soname in this release anyway, move to a single block so the initial stable API is all nicely grouped together. Signed-off-by: Peter Hutterer --- configure.ac | 2 +- src/libinput.c | 6 ------ src/libinput.h | 8 -------- src/libinput.sym | 31 +++++++++++-------------------- 4 files changed, 12 insertions(+), 35 deletions(-) diff --git a/configure.ac b/configure.ac index 1a4eb3af..e4b7df03 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # - If binary compatibility has been broken (eg removed or changed interfaces) # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LIBINPUT_LT_VERSION=9:0:2 +LIBINPUT_LT_VERSION=10:0:0 AC_SUBST(LIBINPUT_LT_VERSION) AM_SILENT_RULES([yes]) diff --git a/src/libinput.c b/src/libinput.c index c1e68eb1..42354ba9 100644 --- a/src/libinput.c +++ b/src/libinput.c @@ -1369,12 +1369,6 @@ libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code return evdev_device_has_button((struct evdev_device *)device, code); } -LIBINPUT_EXPORT int -libinput_device_has_button(struct libinput_device *device, uint32_t code) -{ - return libinput_device_pointer_has_button(device, code); -} - LIBINPUT_EXPORT struct libinput_event * libinput_event_device_notify_get_base_event(struct libinput_event_device_notify *event) { diff --git a/src/libinput.h b/src/libinput.h index 22c02d69..ca08c3e8 100644 --- a/src/libinput.h +++ b/src/libinput.h @@ -1682,14 +1682,6 @@ libinput_device_get_size(struct libinput_device *device, int libinput_device_pointer_has_button(struct libinput_device *device, uint32_t code); -/** - * @ingroup device - * - * @deprecated Use libinput_device_pointer_has_button() instead. - */ -int -libinput_device_has_button(struct libinput_device *device, uint32_t code) LIBINPUT_ATTRIBUTE_DEPRECATED; - /** * @ingroup device * diff --git a/src/libinput.sym b/src/libinput.sym index 644e9105..eed067f0 100644 --- a/src/libinput.sym +++ b/src/libinput.sym @@ -1,6 +1,6 @@ /* in alphabetical order! */ -LIBINPUT_0.8.0 { +LIBINPUT_0.12.0 { global: libinput_config_status_to_str; libinput_device_config_accel_get_default_speed; @@ -15,6 +15,10 @@ global: libinput_device_config_calibration_get_matrix; libinput_device_config_calibration_has_matrix; libinput_device_config_calibration_set_matrix; + libinput_device_config_click_get_default_method; + libinput_device_config_click_get_method; + libinput_device_config_click_get_methods; + libinput_device_config_click_set_method; libinput_device_config_scroll_get_button; libinput_device_config_scroll_get_default_button; libinput_device_config_scroll_get_default_method; @@ -35,6 +39,7 @@ global: libinput_device_config_tap_get_finger_count; libinput_device_config_tap_set_enabled; libinput_device_get_context; + libinput_device_get_device_group; libinput_device_get_id_product; libinput_device_get_id_vendor; libinput_device_get_name; @@ -44,9 +49,13 @@ global: libinput_device_get_sysname; libinput_device_get_udev_device; libinput_device_get_user_data; - libinput_device_has_button; + libinput_device_group_get_user_data; + libinput_device_group_ref; + libinput_device_group_set_user_data; + libinput_device_group_unref; libinput_device_has_capability; libinput_device_led_update; + libinput_device_pointer_has_button; libinput_device_ref; libinput_device_set_seat_logical_name; libinput_device_set_user_data; @@ -118,21 +127,3 @@ global: local: *; }; - -LIBINPUT_0.9.0 { -global: - libinput_device_config_click_get_default_method; - libinput_device_config_click_get_method; - libinput_device_config_click_get_methods; - libinput_device_config_click_set_method; -} LIBINPUT_0.8.0; - -LIBINPUT_0.11.0 { - libinput_device_get_device_group; - libinput_device_group_get_user_data; - libinput_device_group_ref; - libinput_device_group_set_user_data; - libinput_device_group_unref; - - libinput_device_pointer_has_button; -} LIBINPUT_0.9.0; From 3cfa93e58d4b40282c8d486e50050fd2926f84e6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 6 Mar 2015 15:51:49 +1000 Subject: [PATCH 2/3] Sort exported symbols alphabetically Alphabeting is hard... Signed-off-by: Peter Hutterer --- src/libinput.sym | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libinput.sym b/src/libinput.sym index eed067f0..f9da9054 100644 --- a/src/libinput.sym +++ b/src/libinput.sym @@ -7,10 +7,6 @@ global: libinput_device_config_accel_get_speed; libinput_device_config_accel_is_available; libinput_device_config_accel_set_speed; - libinput_device_config_left_handed_get_default; - libinput_device_config_left_handed_get; - libinput_device_config_left_handed_is_available; - libinput_device_config_left_handed_set; libinput_device_config_calibration_get_default_matrix; libinput_device_config_calibration_get_matrix; libinput_device_config_calibration_has_matrix; @@ -19,20 +15,24 @@ global: libinput_device_config_click_get_method; libinput_device_config_click_get_methods; libinput_device_config_click_set_method; + libinput_device_config_left_handed_get; + libinput_device_config_left_handed_get_default; + libinput_device_config_left_handed_is_available; + libinput_device_config_left_handed_set; libinput_device_config_scroll_get_button; libinput_device_config_scroll_get_default_button; libinput_device_config_scroll_get_default_method; libinput_device_config_scroll_get_default_natural_scroll_enabled; - libinput_device_config_scroll_get_methods; libinput_device_config_scroll_get_method; + libinput_device_config_scroll_get_methods; libinput_device_config_scroll_get_natural_scroll_enabled; libinput_device_config_scroll_has_natural_scroll; libinput_device_config_scroll_set_button; libinput_device_config_scroll_set_method; libinput_device_config_scroll_set_natural_scroll_enabled; libinput_device_config_send_events_get_default_mode; - libinput_device_config_send_events_get_modes; libinput_device_config_send_events_get_mode; + libinput_device_config_send_events_get_modes; libinput_device_config_send_events_set_mode; libinput_device_config_tap_get_default_enabled; libinput_device_config_tap_get_enabled; @@ -64,15 +64,15 @@ global: libinput_event_destroy; libinput_event_device_notify_get_base_event; libinput_event_get_context; - libinput_event_get_device_notify_event; libinput_event_get_device; + libinput_event_get_device_notify_event; libinput_event_get_keyboard_event; libinput_event_get_pointer_event; libinput_event_get_touch_event; libinput_event_get_type; libinput_event_keyboard_get_base_event; - libinput_event_keyboard_get_key_state; libinput_event_keyboard_get_key; + libinput_event_keyboard_get_key_state; libinput_event_keyboard_get_seat_key_count; libinput_event_keyboard_get_time; libinput_event_pointer_get_absolute_x; @@ -83,8 +83,8 @@ global: libinput_event_pointer_get_axis_value; libinput_event_pointer_get_axis_value_discrete; libinput_event_pointer_get_base_event; - libinput_event_pointer_get_button_state; libinput_event_pointer_get_button; + libinput_event_pointer_get_button_state; libinput_event_pointer_get_dx; libinput_event_pointer_get_dx_unaccelerated; libinput_event_pointer_get_dy; From 11cec1685206efe02f6146cde15496d3dceab448 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Mar 2015 09:27:37 +1000 Subject: [PATCH 3/3] configure.ac: libinput 0.12.0 And update the LT version instructions to not bump the soname in the future. Signed-off-by: Peter Hutterer --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index e4b7df03..ed0945e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.64]) m4_define([libinput_major_version], [0]) -m4_define([libinput_minor_version], [11]) +m4_define([libinput_minor_version], [12]) m4_define([libinput_micro_version], [0]) m4_define([libinput_version], [libinput_major_version.libinput_minor_version.libinput_micro_version]) @@ -25,11 +25,12 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) # Before making a release, the LIBINPUT_LT_VERSION string should be # modified. # The string is of the form C:R:A. -# - If interfaces have been changed or added, but binary compatibility has -# been preserved, change to C+1:0:A+1 -# - If binary compatibility has been broken (eg removed or changed interfaces) -# change to C+1:0:0 -# - If the interface is the same as the previous version, change to C:R+1:A +# a) If binary compatibility has been broken (eg removed or changed interfaces) +# change to C+1:0:0. DO NOT DO THIS! Use symbol versioning instead and +# do b) instead. +# b) If interfaces have been changed or added, but binary compatibility has +# been preserved, change to C+1:0:A+1 +# c) If the interface is the same as the previous version, change to C:R+1:A LIBINPUT_LT_VERSION=10:0:0 AC_SUBST(LIBINPUT_LT_VERSION)