r42480 - in /desktop/unstable/clutter-1.0/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Sep 5 00:04:05 UTC 2014
Author: pochu
Date: Fri Sep 5 00:04:04 2014
New Revision: 42480
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42480
Log:
* debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch,
debian/patches/0001-evdev-Follow-libinput-enum-rename.patch,
debian/patches/0001-evdev-Update-after-libinput-API-changes.patch,
debian/control.in:
+ Build against libinput 0.5.0.
Added:
desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Follow-libinput-enum-rename.patch
desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Update-after-libinput-API-changes.patch
desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch
Modified:
desktop/unstable/clutter-1.0/debian/changelog
desktop/unstable/clutter-1.0/debian/control
desktop/unstable/clutter-1.0/debian/control.in
desktop/unstable/clutter-1.0/debian/patches/series
Modified: desktop/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/changelog?rev=42480&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/changelog [utf-8] Fri Sep 5 00:04:04 2014
@@ -1,3 +1,13 @@
+clutter-1.0 (1.18.4-2) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch,
+ debian/patches/0001-evdev-Follow-libinput-enum-rename.patch,
+ debian/patches/0001-evdev-Update-after-libinput-API-changes.patch,
+ debian/control.in:
+ + Build against libinput 0.5.0.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Fri, 05 Sep 2014 00:49:17 +0200
+
clutter-1.0 (1.18.4-1) unstable; urgency=medium
* New upstream release 1.18.4
Modified: desktop/unstable/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/control?rev=42480&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/control [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/control [utf-8] Fri Sep 5 00:04:04 2014
@@ -2,6 +2,7 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
+
Source: clutter-1.0
Section: libs
Priority: optional
@@ -32,7 +33,7 @@
libatk1.0-dev (>= 2.5.3),
libgdk-pixbuf2.0-dev (>= 2.0),
libgtk-3-dev (>= 3.3.18),
- libinput-dev (>= 0.1.0) [linux-any],
+ libinput-dev (>= 0.5.0) [linux-any],
libudev-dev (>= 136) [linux-any],
libgudev-1.0-dev [linux-any],
libxkbcommon-dev,
Modified: desktop/unstable/clutter-1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/control.in?rev=42480&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/control.in [utf-8] Fri Sep 5 00:04:04 2014
@@ -28,7 +28,7 @@
libatk1.0-dev (>= 2.5.3),
libgdk-pixbuf2.0-dev (>= 2.0),
libgtk-3-dev (>= 3.3.18),
- libinput-dev (>= 0.1.0) [linux-any],
+ libinput-dev (>= 0.5.0) [linux-any],
libudev-dev (>= 136) [linux-any],
libgudev-1.0-dev [linux-any],
libxkbcommon-dev,
Added: desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Follow-libinput-enum-rename.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Follow-libinput-enum-rename.patch?rev=42480&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Follow-libinput-enum-rename.patch (added)
+++ desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Follow-libinput-enum-rename.patch [utf-8] Fri Sep 5 00:04:04 2014
@@ -0,0 +1,29 @@
+From 31749cfa47babaf3a76292a40fabb768852dcc96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Thu, 5 Jun 2014 09:50:33 +0200
+Subject: [PATCH] evdev: Follow libinput enum rename
+
+s/libinput_pointer_button_state/libinput_button_state/
+s/LIBINPUT_POINTER_BUTTON_STATE_/LIBINPUT_BUTTON_STATE_/
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731254
+---
+ clutter/evdev/clutter-device-manager-evdev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
+index 3834042..1855438 100644
+--- a/clutter/evdev/clutter-device-manager-evdev.c
++++ b/clutter/evdev/clutter-device-manager-evdev.c
+@@ -1164,7 +1164,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
+ time = libinput_event_pointer_get_time (button_event);
+ button = libinput_event_pointer_get_button (button_event);
+ button_state = libinput_event_pointer_get_button_state (button_event) ==
+- LIBINPUT_POINTER_BUTTON_STATE_PRESSED;
++ LIBINPUT_BUTTON_STATE_PRESSED;
+ notify_button (device, time, button, button_state);
+
+ break;
+--
+2.1.0
+
Added: desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Update-after-libinput-API-changes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Update-after-libinput-API-changes.patch?rev=42480&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Update-after-libinput-API-changes.patch (added)
+++ desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Update-after-libinput-API-changes.patch [utf-8] Fri Sep 5 00:04:04 2014
@@ -0,0 +1,115 @@
+From ac26dbbbe94f522438648452d262df0836f54507 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Wed, 25 Jun 2014 12:18:02 +0100
+Subject: [PATCH] evdev: Update after libinput API changes
+
+---
+ clutter/evdev/clutter-device-manager-evdev.c | 46 +++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
+index 442bf19..c8a807b 100644
+--- a/clutter/evdev/clutter-device-manager-evdev.c
++++ b/clutter/evdev/clutter-device-manager-evdev.c
+@@ -1105,7 +1105,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
+ time = libinput_event_keyboard_get_time (key_event);
+ key = libinput_event_keyboard_get_key (key_event);
+ key_state = libinput_event_keyboard_get_key_state (key_event) ==
+- LIBINPUT_KEYBOARD_KEY_STATE_PRESSED;
++ LIBINPUT_KEY_STATE_PRESSED;
+ notify_key_device (device, time, key, key_state, TRUE);
+
+ break;
+@@ -1185,12 +1185,12 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
+
+ switch (axis)
+ {
+- case LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL:
++ case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
+ dx = 0;
+ dy = value;
+ break;
+
+- case LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL:
++ case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
+ dx = value;
+ dy = 0;
+ break;
+@@ -1434,7 +1434,7 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
+ struct udev *udev;
+
+ udev = udev_new ();
+- if (!udev)
++ if (G_UNLIKELY (udev == NULL))
+ {
+ g_warning ("Failed to create udev object");
+ return;
+@@ -1443,18 +1443,25 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
+ manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (gobject);
+ priv = manager_evdev->priv;
+
+- priv->libinput = libinput_udev_create_for_seat (&libinput_interface,
+- manager_evdev,
+- udev,
+- "seat0");
+- udev_unref (udev);
++ priv->libinput = libinput_udev_create_context (&libinput_interface,
++ manager_evdev,
++ udev);
++ if (priv->libinput == NULL)
++ {
++ g_critical ("Failed to create the libinput object.");
++ return;
++ }
+
+- if (!priv->libinput)
++ if (libinput_udev_assign_seat (priv->libinput, "seat0") == -1)
+ {
+- g_warning ("Failed to create libinput object");
++ g_critical ("Failed to assign a seat to the libinput object.");
++ libinput_unref (priv->libinput);
++ priv->libinput = NULL;
+ return;
+ }
+
++ udev_unref (udev);
++
+ priv->main_seat = clutter_seat_evdev_new (manager_evdev);
+
+ dispatch_libinput (manager_evdev);
+@@ -1500,26 +1507,21 @@ clutter_device_manager_evdev_finalize (GObject *object)
+ {
+ ClutterDeviceManagerEvdev *manager_evdev;
+ ClutterDeviceManagerEvdevPrivate *priv;
+- GSList *l;
+
+ manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (object);
+ priv = manager_evdev->priv;
+
+- for (l = priv->seats; l; l = g_slist_next (l))
+- {
+- ClutterSeatEvdev *seat = l->data;
+-
+- clutter_seat_evdev_free (seat);
+- }
+- g_slist_free (priv->seats);
++ g_slist_free_full (priv->seats, (GDestroyNotify) clutter_seat_evdev_free);
+ g_slist_free (priv->devices);
+
+- clutter_event_source_free (priv->event_source);
++ if (priv->event_source != NULL)
++ clutter_event_source_free (priv->event_source);
+
+- if (priv->constrain_data_notify)
++ if (priv->constrain_data_notify != NULL)
+ priv->constrain_data_notify (priv->constrain_data);
+
+- libinput_destroy (priv->libinput);
++ if (priv->libinput != NULL)
++ libinput_unref (priv->libinput);
+
+ G_OBJECT_CLASS (clutter_device_manager_evdev_parent_class)->finalize (object);
+ }
+--
+2.1.0
+
Added: desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch?rev=42480&op=file
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch (added)
+++ desktop/unstable/clutter-1.0/debian/patches/0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch [utf-8] Fri Sep 5 00:04:04 2014
@@ -0,0 +1,110 @@
+From 61929e26e1449a8cbe27086776838d09f446ea7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl at gmail.com>
+Date: Mon, 2 Jun 2014 23:16:21 +0200
+Subject: [PATCH] evdev: Used floating point instead of fixed point numbers
+
+Following the API change in libinput, change the uses of fixed point
+numbers to floating point numbers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731178
+---
+ clutter/evdev/clutter-device-manager-evdev.c | 40 ++++++++++------------------
+ clutter/evdev/clutter-input-device-evdev.h | 2 --
+ configure.ac | 2 +-
+ 3 files changed, 15 insertions(+), 29 deletions(-)
+
+--- a/clutter/evdev/clutter-device-manager-evdev.c
++++ b/clutter/evdev/clutter-device-manager-evdev.c
+@@ -375,8 +375,8 @@
+ static void
+ notify_relative_motion (ClutterInputDevice *input_device,
+ guint32 time_,
+- li_fixed_t dx,
+- li_fixed_t dy)
++ double dx,
++ double dy)
+ {
+ gfloat new_x, new_y;
+ ClutterInputDeviceEvdev *device_evdev;
+@@ -391,17 +391,9 @@
+ device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+ seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+- /* Append previously discarded fraction. */
+- dx += device_evdev->dx_frac;
+- dy += device_evdev->dy_frac;
+-
+ clutter_input_device_get_coords (seat->core_pointer, NULL, &point);
+- new_x = point.x + li_fixed_to_int (dx);
+- new_y = point.y + li_fixed_to_int (dy);
+-
+- /* Save the discarded fraction part for next motion event. */
+- device_evdev->dx_frac = (dx < 0 ? -1 : 1) * (0xff & dx);
+- device_evdev->dy_frac = (dy < 0 ? -1 : 1) * (0xff & dy);
++ new_x = point.x + dx;
++ new_y = point.y + dy;
+
+ notify_absolute_motion (input_device, time_, new_x, new_y);
+ }
+@@ -998,7 +990,7 @@
+ case LIBINPUT_EVENT_POINTER_MOTION:
+ {
+ guint32 time;
+- li_fixed_t dx, dy;
++ double dx, dy;
+ struct libinput_event_pointer *motion_event =
+ libinput_event_get_pointer_event (event);
+ device = libinput_device_get_user_data (libinput_device);
+@@ -1014,7 +1006,7 @@
+ case LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE:
+ {
+ guint32 time;
+- li_fixed_t x, y;
++ double x, y;
+ gfloat stage_width, stage_height;
+ ClutterStage *stage;
+ struct libinput_event_pointer *motion_event =
+@@ -1033,10 +1025,7 @@
+ stage_width);
+ y = libinput_event_pointer_get_absolute_y_transformed (motion_event,
+ stage_height);
+- notify_absolute_motion (device,
+- time,
+- li_fixed_to_double(x),
+- li_fixed_to_double(y));
++ notify_absolute_motion (device, time, x, y);
+
+ break;
+ }
+@@ -1067,8 +1056,7 @@
+ device = libinput_device_get_user_data (libinput_device);
+
+ time = libinput_event_pointer_get_time (axis_event);
+- value = li_fixed_to_double (
+- libinput_event_pointer_get_axis_value (axis_event));
++ value = libinput_event_pointer_get_axis_value (axis_event);
+ axis = libinput_event_pointer_get_axis (axis_event);
+
+ switch (axis)
+--- a/clutter/evdev/clutter-input-device-evdev.h
++++ b/clutter/evdev/clutter-input-device-evdev.h
+@@ -64,8 +64,6 @@
+
+ struct libinput_device *libinput_device;
+ ClutterSeatEvdev *seat;
+- li_fixed_t dx_frac;
+- li_fixed_t dy_frac;
+ };
+
+ GType _clutter_input_device_evdev_get_type (void) G_GNUC_CONST;
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@
+ m4_define([gtk_doc_req_version], [1.20])
+ m4_define([xcomposite_req_version], [0.4])
+ m4_define([gdk_req_version], [3.3.18])
+-m4_define([libinput_req_version], [0.1.0])
++m4_define([libinput_req_version], [0.3.0])
+ m4_define([libudev_req_version], [136])
+
+ AC_SUBST([GLIB_REQ_VERSION], [glib_req_version])
Modified: desktop/unstable/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/patches/series?rev=42480&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/patches/series [utf-8] Fri Sep 5 00:04:04 2014
@@ -0,0 +1,3 @@
+0001-evdev-Used-floating-point-instead-of-fixed-point-num.patch
+0001-evdev-Follow-libinput-enum-rename.patch
+0001-evdev-Update-after-libinput-API-changes.patch
More information about the pkg-gnome-commits
mailing list