From 7bbdf1f098496546481db75fb37077776ee62aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:14 +0100
Subject: Move common input components from wayland-generic to input-common
 stratum

This is libinput library and deps

These are common dependencies to weston and clutter/gtk
---
 strata/input-common.morph                          | 45 ++++++++++++++++++++++
 strata/input-common/linux-api-headers.morph        |  9 +++++
 strata/wayland-generic.morph                       | 42 --------------------
 strata/wayland-generic/linux-api-headers.morph     |  9 -----
 strata/weston-genivi.morph                         |  1 +
 ...genivi-baseline-system-armv7lhf-versatile.morph |  2 +
 .../genivi-baseline-system-x86_64-generic.morph    |  2 +
 7 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 strata/input-common.morph
 create mode 100644 strata/input-common/linux-api-headers.morph
 delete mode 100644 strata/wayland-generic/linux-api-headers.morph

diff --git a/strata/input-common.morph b/strata/input-common.morph
new file mode 100644
index 00000000..d3831b47
--- /dev/null
+++ b/strata/input-common.morph
@@ -0,0 +1,45 @@
+name: input-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+chunks:
+- name: mtdev
+  repo: upstream:mtdev-git
+  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: 705b9bbb426410f9510601c7010da51184919b36
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
+  repo: upstream:xkeyboard-config
+  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: libevdev
+  repo: upstream:libevdev
+  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: linux-api-headers
+  morph: strata/input-common/linux-api-headers.morph
+  repo: upstream:linux
+  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: libinput
+  repo: upstream:libinput
+  ref: 0.5.0
+  build-depends:
+  - mtdev
+  - libevdev
+  - linux-api-headers
diff --git a/strata/input-common/linux-api-headers.morph b/strata/input-common/linux-api-headers.morph
new file mode 100644
index 00000000..595138fe
--- /dev/null
+++ b/strata/input-common/linux-api-headers.morph
@@ -0,0 +1,9 @@
+name: linux-api-headers
+kind: chunk
+build-commands:
+- make mrproper
+- make headers_check
+install-commands:
+- make INSTALL_HDR_PATH=dest headers_install
+- install -d "$DESTDIR${PREFIX-/usr}/include"
+- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 6bc1518a..d24ffccc 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -21,45 +21,3 @@ chunks:
   unpetrify-ref: baserock/gnome
   build-depends:
   - wayland
-- name: mtdev
-  repo: upstream:mtdev-git
-  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
-  ref: 705b9bbb426410f9510601c7010da51184919b36
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
-  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-app-xkbcomp
-- name: libevdev
-  repo: upstream:libevdev
-  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: linux-api-headers
-  morph: strata/wayland-generic/linux-api-headers.morph
-  repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: libinput
-  repo: upstream:libinput
-  ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends:
-  - libxkbcommon
-  - mtdev
-  - libevdev
-  - linux-api-headers
diff --git a/strata/wayland-generic/linux-api-headers.morph b/strata/wayland-generic/linux-api-headers.morph
deleted file mode 100644
index 595138fe..00000000
--- a/strata/wayland-generic/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 1f62b5af..c29020a1 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -2,6 +2,7 @@ name: weston-genivi
 kind: stratum
 build-depends:
 - morph: strata/graphics-common.morph
+- morph: strata/input-common.morph
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index aec413dc..7c283170 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 711011c1..1ebefaeb 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- 
cgit v1.2.1