diff --git a/srcpkgs/clutter/patches/evdev-0.6.patch b/srcpkgs/clutter/patches/evdev-0.6.patch deleted file mode 100644 index 092ed3f4ff8..00000000000 --- a/srcpkgs/clutter/patches/evdev-0.6.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 31f2353126b..6f5111802aa 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -1,6 +1,6 @@ # Template file for 'clutter' pkgname=clutter -version=1.16.4 +version=1.18.0 revision=1 build_style=gnu-configure configure_args="--enable-introspection --enable-evdev-input @@ -8,20 +8,18 @@ configure_args="--enable-introspection --enable-evdev-input 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>=0.6 libgudev-devel" -# egl/kms/wayland support in cogl -depends="cogl>=1.16.0_2" + libxkbcommon-devel cogl-devel>=1.18 libinput-devel" short_desc="OpenGL based interactive canvas library" maintainer="Juan RP " homepage="http://www.clutter-project.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" -checksum=cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65 +checksum=937ac94d10d4562c67554dd3d087bf0859a3bf254922a226fc0c13a39a457869 clutter-devel_package() { - depends="cogl-devel>=1.16.0_2 cairo-devel atk-devel pango-devel json-glib-devel + depends="cogl-devel>=1.18 cairo-devel atk-devel pango-devel json-glib-devel libX11-devel libXext-devel libXfixes-devel libXdamage-devel - libXcomposite-devel libXi-devel libevdev-devel libgudev-devel + libXcomposite-devel libXi-devel libinput-devel libxkbcommon-devel clutter>=${version}_${revision}" short_desc+=" - development files" pkg_install() {