packaging: Bump up to 1.8.0

Change-Id: I4530bc57d1cbc9d9441f95e2e68c944ad7210794

diff --git a/packaging/libinput.spec b/packaging/libinput.spec
index 9aa98de..004c3a9 100644 (file)
--- a/packaging/libinput.spec
+++ b/packaging/libinput.spec
@@ -1,7 +1,7 @@
 %define udev_dir %{_prefix}/lib/udev
 
 Name:           libinput
-Version:        0.11.0
+Version:        1.8.0
 Release:        0
 License:        MIT
 Summary:        Input devices for display servers and other applications
@@ -50,7 +50,7 @@ functionality that users expect.
 %setup -q
 cp %{SOURCE1001} .
 
-%autogen --with-udev-dir=%{udev_dir}
+%autogen --with-udev-dir=%{udev_dir} --disable-documentation --disable-debug-gui --disable-tests --disable-libwacom
 
 %build
 %__make %{?_smp_mflags}
@@ -70,6 +70,7 @@ cp %{SOURCE1001} .
 %{_libdir}/*.so.*
 %{udev_dir}/%{name}*
 %{udev_dir}/rules.d/*%{name}*
+%exclude /usr/lib/udev/hwdb.d/*
 
 %files devel
 %manifest %{name}.manifest

diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c
index aa30044..1a6b107 100644 (file)
--- a/src/evdev-fallback.c
+++ b/src/evdev-fallback.c
@@ -500,13 +500,13 @@ fallback_process_touch_extra_aux_data(struct fallback_dispatch *dispatch,
        struct mt_aux_data *aux_data;
        struct list *current_axis_list;
 
-       if (!dispatch->mt.aux_data_list) return false;
+       if (!dispatch->mt.aux_data_list) return;
        if (dispatch->mt.slot < 0 || dispatch->mt.slot >= (int)dispatch->mt.slots_len)
-               return false;
+               return;
 
        current_axis_list = &dispatch->mt.aux_data_list[dispatch->mt.slot];
 
-       if (list_empty(current_axis_list)) return false;
+       if (list_empty(current_axis_list)) return;
 
        list_for_each(aux_data, current_axis_list, link) {
                if (aux_data->code == e->code) {

diff --git a/src/evdev.c b/src/evdev.c
index bd1fb4a..852a0d8 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2047,15 +2047,15 @@ evdev_configure_device(struct evdev_device *device)
                env = getenv("LIBINPUT_IGNORE_JOYSTICK");
                if (env && atoi(env) == 1) {
                        evdev_log_info(device,
-                                "device '%s', %s have joystick, ignoring\n",
-                                device->devname, devnode);
+                                "input device '%s' have joystick, ignoring\n",
+                                device->devname);
                        return NULL;
                }
                else {
                        if (evdev_device_is_joystick_or_gamepad(device)) {
                                evdev_log_info(device,
-                                        "device '%s', %s is a joystick, ignoring\n",
-                                        device->devname, devnode);
+                                        "input device '%s' is a joystick, ignoring\n",
+                                        device->devname);
                                return NULL;
                        }
                }

diff --git a/src/udev-seat.c b/src/udev-seat.c
index 334a9d7..856c069 100644 (file)
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -34,11 +34,6 @@
 static const char default_seat[] = "seat0";
 static const char default_seat_name[] = "default";
 
-char **
-strv_from_string(const char *in, const char *separators);
-bool
-parse_calibration_property(const char *prop, float calibration_out[6]);
-
 static struct udev_seat *
 udev_seat_create(struct udev_input *input,
                 const char *device_seat,
@@ -97,50 +92,6 @@ libinput_path_has_device(struct libinput *libinput, const char *devnode)
        return false;
 }
 
-static inline bool
-safe_atod(const char *str, double *val)
-{
-       char *endptr;
-       double v;
-       locale_t c_locale;
-
-       /* Create a "C" locale to force strtod to use '.' as separator */
-       c_locale = newlocale(LC_NUMERIC_MASK, "C", (locale_t)0);
-       if (c_locale == (locale_t)0)
-               return false;
-
-       errno = 0;
-       v = strtod_l(str, &endptr, c_locale);
-       freelocale(c_locale);
-       if (errno > 0)
-               return false;
-       if (str == endptr)
-               return false;
-       if (*str != '\0' && *endptr != '\0')
-               return false;
-       if (isnan(v) || isinf(v))
-               return false;
-
-       *val = v;
-       return true;
-}
-
-static inline void
-strv_free(char **strv) {
-       char **s = strv;
-
-       if (!strv)
-               return;
-
-       while (*s != NULL) {
-               free(*s);
-               *s = (char*)0x1; /* detect use-after-free */
-               s++;
-       }
-
-       free (strv);
-}
-
 /**
  * Return the next word in a string pointed to by state before the first
  * separator character. Call repeatedly to tokenize a whole string.
@@ -173,95 +124,6 @@ next_word(const char **state, size_t *len, const char *separators)
        return next;
 }
 
-/**
- * Return a null-terminated string array with the tokens in the input
- * string, e.g. "one two\tthree" with a separator list of " \t" will return
- * an array [ "one", "two", "three", NULL ].
- *
- * Use strv_free() to free the array.
- *
- * @param in Input string
- * @param separators List of separator characters
- *
- * @return A null-terminated string array or NULL on errors
- */
-char **
-strv_from_string(const char *in, const char *separators)
-{
-       const char *s, *word;
-       char **strv = NULL;
-       int nelems = 0, idx;
-       size_t l;
-
-       assert(in != NULL);
-
-       s = in;
-       while ((word = next_word(&s, &l, separators)) != NULL)
-              nelems++;
-
-       if (nelems == 0)
-               return NULL;
-
-       nelems++; /* NULL-terminated */
-       strv = zalloc(nelems * sizeof *strv);
-       if (!strv)
-               return NULL;
-
-       idx = 0;
-
-       s = in;
-       while ((word = next_word(&s, &l, separators)) != NULL) {
-               char *copy = strndup(word, l);
-               if (!copy) {
-                       strv_free(strv);
-                       return NULL;
-               }
-
-               strv[idx++] = copy;
-       }
-
-       return strv;
-}
-
-/**
- * Parses a set of 6 space-separated floats.
- *
- * @param prop The string value of the property
- * @param calibration Returns the six components
- * @return true on success, false otherwise
- */
-bool
-parse_calibration_property(const char *prop, float calibration_out[6])
-{
-       int idx;
-       char **strv;
-       float calibration[6];
-
-       if (!prop)
-               return false;
-
-       strv = strv_from_string(prop, " ");
-       if (!strv)
-               return false;
-
-       for (idx = 0; idx < 6; idx++) {
-               double v;
-               if (strv[idx] == NULL || !safe_atod(strv[idx], &v)) {
-                       strv_free(strv);
-                       return false;
-               }
-
-               calibration[idx] = v;
-       }
-
-       strv_free(strv);
-
-       memcpy(calibration_out, calibration, sizeof(calibration));
-
-       return true;
-}
-
-
 static int
 device_added(struct udev_device *udev_device,
             struct udev_input *input,