From c4630e790064adca0fb20a5945618d4809a6f983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 9 Sep 2014 15:05:07 +0000 Subject: Add GNOME stratum, system and cluster This introduces a second version of libxkbcommon. This is unavoidable really as (a) libinput requires libxkbcommon, (b) Mutter requires libxkbcommon with X11 support enabled, and (c) X11 support in libxkbcommon requires xcb-xkb. To avoid the input-common stratum depending on the whole of X11, we do two variants of libxkbcommon and, in the case where X11 support is needed, one overrides the other. Change-Id: Ib6a47a4eb859d7b32c94f0cb05add774db6d15c8 --- strata/input-common.morph | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'strata/input-common.morph') diff --git a/strata/input-common.morph b/strata/input-common.morph index 4a0326dd..733121b1 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -3,6 +3,7 @@ kind: stratum build-depends: - morph: strata/foundation.morph - morph: strata/xorg-util-macros-common.morph +- morph: strata/x-common.morph chunks: - name: mtdev repo: upstream:mtdev-git @@ -27,8 +28,10 @@ chunks: build-depends: - mtdev - libevdev -- name: libxkbcommon - morph: strata/input-common/libxkbcommon.morph +- name: libxkbcommon-no-x11 repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 + morph: strata/input-common/libxkbcommon-no-x11.morph unpetrify-ref: xkbcommon-0.5.0 + build-depends: + - xkeyboard-config -- cgit v1.2.1