[jhbuild] core-deps-3.18/3.20: Move --enable-evdev-input to a separate condition for clutter

[Ting-Wei Lan <lantw src gnome org>]

commit 533539bed08c08e02df55d154a23849b62552615
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Thu Aug 13 15:38:52 2015 +0800

    core-deps-3.18/3.20: Move --enable-evdev-input to a separate condition for clutter
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753576

 jhbuild/utils/sysid.py                         |    2 +-
 modulesets/gnome-suites-core-deps-3.18.modules |   10 ++++++++--
 modulesets/gnome-suites-core-deps-3.20.modules |   10 ++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/jhbuild/utils/sysid.py b/jhbuild/utils/sysid.py
index 2e0e56d..9146942 100644
--- a/jhbuild/utils/sysid.py
+++ b/jhbuild/utils/sysid.py
@@ -129,7 +129,7 @@ def ensure_loaded():
     # of 'freebsd') then we just need to make sure the more-specific one
     # comes first in the list
     conditions_sets = [
-            ('linux', ['linux', 'wayland', 'udev', 'x11', 'systemd', 'gnu-elf']),
+            ('linux', ['linux', 'wayland', 'udev', 'evdev', 'x11', 'systemd', 'gnu-elf']),
             ('freebsd', ['freebsd', 'x11', 'bsd', 'gnu-elf', 'gmake']),
             ('darwin', ['darwin', 'macos', 'quartz']),
 
diff --git a/modulesets/gnome-suites-core-deps-3.18.modules b/modulesets/gnome-suites-core-deps-3.18.modules
index d734a57..b4f91ca 100644
--- a/modulesets/gnome-suites-core-deps-3.18.modules
+++ b/modulesets/gnome-suites-core-deps-3.18.modules
@@ -395,8 +395,11 @@
   </autotools>
 
   <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
+    <if condition-set="evdev">
+      <autogenargs value="--enable-evdev-input"/>
+    </if>
     <if condition-set="wayland">
-      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
+      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor"/>
     </if>
     <branch/>
     <dependencies>
@@ -406,10 +409,13 @@
       <dep package="cairo"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
+      <if condition-set="evdev">
+        <dep package="libinput"/>
+        <dep package="libxkbcommon"/>
+      </if>
       <if condition-set="wayland">
         <dep package="wayland"/>
         <dep package="libxkbcommon"/>
-        <dep package="libinput"/>
       </if>
     </dependencies>
     <suggests>
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index b917de9..9f786b5 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -345,8 +345,11 @@
   </autotools>
 
   <autotools id="clutter" autogenargs="--enable-installed-tests --enable-egl-backend">
+    <if condition-set="evdev">
+      <autogenargs value="--enable-evdev-input"/>
+    </if>
     <if condition-set="wayland">
-      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor --enable-evdev-input"/>
+      <autogenargs value="--enable-wayland-backend --enable-wayland-compositor"/>
     </if>
     <branch/>
     <dependencies>
@@ -356,10 +359,13 @@
       <dep package="cairo"/>
       <dep package="json-glib"/>
       <dep package="gobject-introspection"/>
+      <if condition-set="evdev">
+        <dep package="libinput"/>
+        <dep package="libxkbcommon"/>
+      </if>
       <if condition-set="wayland">
         <dep package="wayland"/>
         <dep package="libxkbcommon"/>
-        <dep package="libinput"/>
       </if>
     </dependencies>
     <suggests>