diff --git a/common/shlibs b/common/shlibs index 1616bc2b7ef..8300ac9704d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1392,7 +1392,7 @@ libSDL2-2.0.so.0 SDL2-2.0.0_1 libcacard.so.0 libcacard-1.6.1_1 libxcb-cursor.so.0 xcb-util-cursor-0.1.0_1 libgldi.so.3 libgldi-3.3.1_1 -libevdev.so.1 libevdev-0.4_1 +libevdev.so.1 libevdev-0.6_1 libmutter-wayland.so.0 mutter-wayland-3.10.1_1 libgdiplus.so.0 libgdiplus-2.10.9_1 libmonosgen-2.0.so.1 mono-3.2.3_1 diff --git a/srcpkgs/clutter/patches/evdev-0.6.patch b/srcpkgs/clutter/patches/evdev-0.6.patch new file mode 100644 index 00000000000..092ed3f4ff8 --- /dev/null +++ b/srcpkgs/clutter/patches/evdev-0.6.patch @@ -0,0 +1,34 @@ +--- clutter/evdev/clutter-device-manager-evdev.c.orig 2014-01-11 20:23:48.666461064 +0100 ++++ clutter/evdev/clutter-device-manager-evdev.c 2014-01-11 20:24:23.951600220 +0100 +@@ -605,11 +605,11 @@ sync_source (ClutterEventSource *source) + const gchar *device_path; + + /* We read a SYN_DROPPED, ignore it and sync the device */ +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev); + while (err == 1) + { + dispatch_one_event (source, &ev); +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_SYNC, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_SYNC, &ev); + } + + if (err != -EAGAIN && CLUTTER_HAS_DEBUG (EVENT)) +@@ -664,7 +664,7 @@ clutter_event_dispatch (GSource *g_s + if (clutter_events_pending ()) + goto queue_event; + +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev); + while (err != -EAGAIN) + { + if (err == 1) +@@ -677,7 +677,7 @@ clutter_event_dispatch (GSource *g_s + goto out; + } + +- err = libevdev_next_event (source->dev, LIBEVDEV_READ_NORMAL, &ev); ++ err = libevdev_next_event (source->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev); + } + + queue_event: diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 19f8abbfa11..830a0d2ea87 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,14 +1,14 @@ # Template file for 'clutter' pkgname=clutter version=1.16.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-introspection --enable-evdev-input --enable-wayland-backend --enable-egl-backend --enable-wayland-compositor" hostmakedepends="pkg-config intltool gobject-introspection" makedepends=" atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel - libxkbcommon-devel cogl-devel>=1.16.0_2 libevdev-devel libgudev-devel" + libxkbcommon-devel cogl-devel>=1.16.0_2 libevdev-devel>=0.6 libgudev-devel" # egl/kms/wayland support in cogl depends="cogl>=1.16.0_2" short_desc="OpenGL based interactive canvas library" @@ -17,9 +17,6 @@ homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" checksum=0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42 -long_desc=" - Clutter is an open source software library for creating fast, visually - rich and animated graphical user interfaces." clutter-devel_package() { depends="cogl-devel>=1.16.0_2 cairo-devel atk-devel pango-devel json-glib-devel