From bfbe004a3edb08bc8c8e285eb829fad3a057ffb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 7 Sep 2015 19:58:59 +0100
Subject: Move libxkbcommon from wayland-generic to input-common

Its not a wayland dependency and it belongs to the input system

Change-Id: I60765b8bc00c262bfa7c178b87dd11a2463a67a5
---
 strata/input-common.morph                 | 5 +++++
 strata/input-common/libxkbcommon.morph    | 5 +++++
 strata/wayland-generic.morph              | 8 --------
 strata/wayland-generic/libxkbcommon.morph | 5 -----
 4 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 strata/input-common/libxkbcommon.morph
 delete mode 100644 strata/wayland-generic/libxkbcommon.morph

(limited to 'strata')

diff --git a/strata/input-common.morph b/strata/input-common.morph
index ee866f43..4a0326dd 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -27,3 +27,8 @@ chunks:
   build-depends:
   - mtdev
   - libevdev
+- name: libxkbcommon
+  morph: strata/input-common/libxkbcommon.morph
+  repo: upstream:xorg-lib-libxkbcommon
+  ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+  unpetrify-ref: xkbcommon-0.5.0
diff --git a/strata/input-common/libxkbcommon.morph b/strata/input-common/libxkbcommon.morph
new file mode 100644
index 00000000..04048abb
--- /dev/null
+++ b/strata/input-common/libxkbcommon.morph
@@ -0,0 +1,5 @@
+name: libxkbcommon
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-x11
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 37a57c5b..cf89a1b5 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -2,17 +2,9 @@ name: wayland-generic
 kind: stratum
 build-depends:
 - morph: strata/core.morph
-- morph: strata/xorg-util-macros-common.morph
 chunks:
-- name: libxkbcommon
-  morph: strata/wayland-generic/libxkbcommon.morph
-  repo: upstream:xorg-lib-libxkbcommon
-  ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
-  unpetrify-ref: xkbcommon-0.5.0
 - name: wayland
   morph: strata/wayland-generic/wayland.morph
   repo: upstream:wayland
   ref: 60024af597b68974c451c89f960a7c11de11c33a
   unpetrify-ref: 1.8.0
-  build-depends:
-  - libxkbcommon
diff --git a/strata/wayland-generic/libxkbcommon.morph b/strata/wayland-generic/libxkbcommon.morph
deleted file mode 100644
index 04048abb..00000000
--- a/strata/wayland-generic/libxkbcommon.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: libxkbcommon
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-x11
-- 
cgit v1.2.1