diff --git a/0001-evdev-use-libinput-s-new-merged-scroll-events.patch b/0001-evdev-use-libinput-s-new-merged-scroll-events.patch deleted file mode 100644 index 5b956bf..0000000 --- a/0001-evdev-use-libinput-s-new-merged-scroll-events.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 358039182478140c8dcb7bcd077fff855d836bac Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 16 Jan 2015 01:03:52 +0100 -Subject: [PATCH] evdev: use libinput's new merged scroll events - -libinput's API changed from separate scroll events for vert/horiz scrolling to -a single event that contains both axes if they changed. - -Updated by Armin K. to use the discrete axis value for wheel events as done -in Weston. ---- - clutter/evdev/clutter-device-manager-evdev.c | 40 +++++++++++++++++++--------- - configure.ac | 2 +- - 2 files changed, 28 insertions(+), 14 deletions(-) - -diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c -index 7b48481..2b3828a 100644 ---- a/clutter/evdev/clutter-device-manager-evdev.c -+++ b/clutter/evdev/clutter-device-manager-evdev.c -@@ -1191,29 +1191,43 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev, - - case LIBINPUT_EVENT_POINTER_AXIS: - { -- gdouble value, dx = 0.0, dy = 0.0; -+ gdouble dx = 0.0, dy = 0.0; - guint32 time; -+ gboolean wheel = FALSE; - enum libinput_pointer_axis axis; -+ enum libinput_pointer_axis_source source; - struct libinput_event_pointer *axis_event = - libinput_event_get_pointer_event (event); -+ - device = libinput_device_get_user_data (libinput_device); - - time = libinput_event_pointer_get_time (axis_event); -- value = libinput_event_pointer_get_axis_value (axis_event); -- axis = libinput_event_pointer_get_axis (axis_event); -+ source = libinput_event_pointer_get_axis_source (axis_event); - -- switch (axis) -- { -- case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL: -- dx = 0; -- dy = value; -- break; -+ /* libinput < 0.8 sent wheel click events with value 10. Since 0.8 -+ the value is the angle of the click in degrees. To keep -+ backwards-compat with existing clients, we just send multiples of -+ the click count. */ -+ -+ if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL) -+ wheel = TRUE; - -- case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL: -- dx = value; -- dy = 0; -- break; -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dy = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dy = libinput_event_pointer_get_axis_value (axis_event, axis); -+ } - -+ axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL; -+ if (libinput_event_pointer_has_axis (axis_event, axis)) -+ { -+ if (wheel) -+ dx = 10 * libinput_event_pointer_get_axis_value_discrete (axis_event, axis); -+ else -+ dx = libinput_event_pointer_get_axis_value (axis_event, axis); - } - - notify_scroll (device, time, dx, dy); -diff --git a/configure.ac b/configure.ac -index 0a9a580..2a47744 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,7 +146,7 @@ m4_define([uprof_req_version], [0.3]) - 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.4.0]) -+m4_define([libinput_req_version], [0.8.0]) - m4_define([libudev_req_version], [136]) - - AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) --- -2.2.2 - diff --git a/clutter.spec b/clutter.spec index 8b9d944..30ce5e2 100644 --- a/clutter.spec +++ b/clutter.spec @@ -7,8 +7,8 @@ %global with_tests 1 Name: clutter -Version: 1.21.2 -Release: 3%{?dist} +Version: 1.21.4 +Release: 1%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries @@ -16,8 +16,6 @@ License: LGPLv2+ URL: http://www.clutter-project.org/ Source0: http://download.gnome.org/sources/clutter/1.21/clutter-%{version}.tar.xz -Patch01: 0001-evdev-use-libinput-s-new-merged-scroll-events.patch - BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel BuildRequires: cogl-devel >= 1.15.1 @@ -29,7 +27,6 @@ BuildRequires: libXcomposite-devel BuildRequires: libXdamage-devel BuildRequires: libXi-devel BuildRequires: libevdev-devel -BuildRequires: automake autoconf libtool BuildRequires: gettext-devel %if 0%{?with_wayland} BuildRequires: libgudev1-devel @@ -82,10 +79,8 @@ the functionality of the installed clutter package. %prep %setup -q -%patch01 -p1 %build -autoreconf -i -f %configure \ --enable-xinput \ --enable-gdk-backend \ @@ -138,6 +133,9 @@ make check %{?_smp_mflags} V=1 %endif %changelog +* Thu Jan 22 2015 Florian Müllner - 1.21.4-1 +- Update to 1.21.4 + * Mon Jan 19 2015 Peter Hutterer 1.21.2-3 - Run autoreconf diff --git a/sources b/sources index 0b62130..1d871f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb8b8e7e2d7bb0eb3145047a1a5e9533 clutter-1.21.2.tar.xz +2274ad3d04cac4e6eeff49979473442a clutter-1.21.4.tar.xz