diff options
| author | Javier Jardón <jjardon@gnome.org> | 2014-11-26 18:33:56 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2014-11-26 18:34:14 +0000 |
| commit | f53634d0e39c233fd0f65cfa04782c64252b897b (patch) | |
| tree | 9d9eff7c8c8495afee44f4fd4c75170df03929a5 /strata | |
| parent | 8bb1b9322486be1e7554964b2fd572ab92431ff5 (diff) | |
| parent | 5e4c1e4d7f83c87deb5ea2552b5090637204f0cb (diff) | |
| download | definitions-f53634d0e39c233fd0f65cfa04782c64252b897b.tar.gz | |
Merge branch 'baserock/jjardon/weston'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/input-common.morph | 4 | ||||
| -rw-r--r-- | strata/wayland-generic.morph | 5 | ||||
| -rw-r--r-- | strata/wayland-generic/libxkbcommon.morph | 5 | ||||
| -rw-r--r-- | strata/weston-common.morph | 21 | ||||
| -rw-r--r-- | strata/weston-common/weston.morph | 9 |
5 files changed, 40 insertions, 4 deletions
diff --git a/strata/input-common.morph b/strata/input-common.morph index 0e9d25e6..233bff22 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,8 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d - unpetrify-ref: 0.5.0 + ref: 224f1d823b2d44aa5193d5b997d73e4322c50f41 + unpetrify-ref: 0.6.0 build-depends: - mtdev - libevdev diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 628ff2ad..890489dc 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -5,9 +5,10 @@ build-depends: - morph: strata/xorg-util-macros-common.morph chunks: - name: libxkbcommon + morph: strata/wayland-generic/libxkbcommon.morph repo: upstream:xorg-lib-libxkbcommon - ref: b721254769212d671a4729f1c88b059979b80efc - unpetrify-ref: baserock/genivi/baseline + ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 + unpetrify-ref: xkbcommon-0.5.0 build-depends: [] - name: wayland morph: strata/wayland-generic/wayland.morph diff --git a/strata/wayland-generic/libxkbcommon.morph b/strata/wayland-generic/libxkbcommon.morph new file mode 100644 index 00000000..04048abb --- /dev/null +++ b/strata/wayland-generic/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/weston-common.morph b/strata/weston-common.morph new file mode 100644 index 00000000..1d5b015c --- /dev/null +++ b/strata/weston-common.morph @@ -0,0 +1,21 @@ +name: weston-common +kind: stratum +build-depends: +- morph: strata/graphics-common.morph +- morph: strata/input-common.morph +- morph: strata/mesa-common.morph +- morph: strata/libdrm-common.morph +- morph: strata/wayland-generic.morph +chunks: +- name: linux-pam + repo: upstream:linux-pam + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] +- name: weston + morph: strata/weston-common/weston.morph + repo: upstream:weston + ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f + unpetrify-ref: baserock/weston-1.6.0/tegra + build-depends: + - linux-pam diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph new file mode 100644 index 00000000..2efd662e --- /dev/null +++ b/strata/weston-common/weston.morph @@ -0,0 +1,9 @@ +name: weston +kind: chunk +build-system: autotools +configure-commands: +- | + ./autogen.sh --prefix="$PREFIX" \ + --disable-xwayland \ + --disable-x11-compositor \ + --enable-demo-clients-install |