From 745598d9ece9aa38ab98d54a81617ede622fe546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 25 Feb 2016 14:00:54 +0000
Subject: strata/input-common.morph: Upgrade libinput to 1.2.0

Change-Id: I8804aa8d5c7d4a9d2ba714a518775e34b6b19f6f
---
 strata/gnome.morph                                      |  6 ------
 strata/input-common.morph                               | 12 ++++++++++--
 systems/genivi-baseline-system-armv7lhf-jetson.morph    |  2 ++
 systems/genivi-baseline-system-armv7lhf-versatile.morph |  2 ++
 systems/genivi-baseline-system-x86_64-generic.morph     |  2 ++
 systems/genivi-demo-platform-armv7lhf-jetson.morph      |  2 ++
 systems/genivi-demo-platform-x86_64-generic.morph       |  2 ++
 systems/weston-qt5-system-x86_64.morph                  |  2 ++
 systems/weston-system-armv7lhf-jetson.morph             |  2 ++
 systems/weston-system-x86_64-generic.morph              |  2 ++
 systems/xfce-system-x86_64.morph                        |  2 ++
 11 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/strata/gnome.morph b/strata/gnome.morph
index aba5c458..2ce4858b 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -596,11 +596,6 @@ chunks:
   ref: ac2aef0f47fd998555abf18003f4c11ffecbf542
   unpetrify-ref: 2.32.0
   build-system: autotools
-- name: libwacom
-  repo: upstream:linuxwacom/libwacom
-  ref: c707d0f98c79260cb72b5d2bdded50b4e816e350
-  unpetrify-ref: libwacom-0.15
-  build-system: autotools
 - name: gnome-bluetooth
   repo: upstream:gnome/gnome-bluetooth
   ref: eb2558d45518f7c23c20fa7b13639f013810494e
@@ -694,7 +689,6 @@ chunks:
   - libcanberra
   - libgtop
   - libpwquality
-  - libwacom
   - network-manager-applet
 - name: gnome-initial-setup
   morph: strata/gnome/gnome-initial-setup.morph
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 2e1c0dd3..a2df41cd 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -1,7 +1,9 @@
 name: input-common
 kind: stratum
 build-depends:
+- morph: strata/device-management.morph
 - morph: strata/foundation.morph
+- morph: strata/glib-common.morph
 - morph: strata/xorg-util-macros-common.morph
 - morph: strata/x-common.morph
 chunks:
@@ -20,14 +22,20 @@ chunks:
   ref: 6f03fd49fb949e46ebccb5dfb54489584896c791
   unpetrify-ref: libevdev-1.4.2
   build-system: autotools
+- name: libwacom
+  repo: upstream:linuxwacom/libwacom
+  ref: c707d0f98c79260cb72b5d2bdded50b4e816e350
+  unpetrify-ref: libwacom-0.15
+  build-system: autotools
 - name: libinput
   repo: upstream:libinput
-  ref: a340736e9b9399f630ff4b436930c1dee26cb803
-  unpetrify-ref: 1.1.4
+  ref: 45e5847bf3e755532b2b6a62b74b85fcdadf2e36
+  unpetrify-ref: 1.2.0
   build-system: autotools
   build-depends:
   - mtdev
   - libevdev
+  - libwacom
 - name: libxkbcommon-no-x11
   repo: upstream:xorg-lib-libxkbcommon
   ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 138ecc8c..ccf59f81 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 09662627..74493383 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index d80ca21e..bbef3ee3 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -15,6 +15,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: glib-common
diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph
index c99739e1..b2eef775 100644
--- a/systems/genivi-demo-platform-armv7lhf-jetson.morph
+++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: libdrm-common
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index 83d510b7..17f077ad 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -19,6 +19,8 @@ strata:
   morph: strata/connectivity.morph
 - name: connman-common
   morph: strata/connman-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: audio-bluetooth
   morph: strata/audio-bluetooth.morph
 - name: libdrm-common
diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph
index b7fe546a..1e19a543 100644
--- a/systems/weston-qt5-system-x86_64.morph
+++ b/systems/weston-qt5-system-x86_64.morph
@@ -10,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: audio-bluetooth
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index 652c4690..5b25ebd0 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -10,6 +10,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-jetson
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 0adfa767..5e91fb71 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -9,6 +9,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: foundation
   morph: strata/foundation.morph
 - name: bsp-x86_64-generic
diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph
index fedddd57..62616000 100644
--- a/systems/xfce-system-x86_64.morph
+++ b/systems/xfce-system-x86_64.morph
@@ -9,6 +9,8 @@ strata:
   morph: strata/core.morph
 - name: coreutils-common
   morph: strata/coreutils-common.morph
+- name: device-management
+  morph: strata/device-management.morph
 - name: python2-core
   morph: strata/python2-core.morph
 - name: foundation
-- 
cgit v1.2.1