From 8cc75aafef7b74438b634ae5da22ad0b43601eb3 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 15 Oct 2015 16:27:04 +0000 Subject: Use a specific combination of wayland-ivi-extension, weston and libinupt This is necessary because: * genivi-demo-platform-hmi requires features of wayland-ivi-extension which were taken out after version 1.3.91 * It links against an ivi-layout module in weston with an interface that is part of the weston-ivi-shell fork before it was merged with weston, hence it must be a version before weston 1.7. this existed as the branch "weston-ivi-shell-1.6.0-rc1-testing-01" on github/ntanibata/weston-ivi-shell. * libinput 0.7, because 0.8+ changed function signatures that weston uses. Signed-off-by: Jonathan Maw Signed-off-by: James Thomas Change-Id: I2c7c6e64119d7e91883e3ce4cfddef56c4762f88 --- strata/weston-genivi.morph | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'strata/weston-genivi.morph') diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ea619821..88d6df66 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -2,7 +2,7 @@ name: weston-genivi kind: stratum build-depends: - morph: strata/graphics-common.morph -- morph: strata/input-common.morph +- morph: strata/input-genivi.morph - morph: strata/mesa-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph @@ -10,12 +10,12 @@ chunks: - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 - unpetrify-ref: baserock/genivi/1.3.0 + ref: 1a43127064349577d1d41a910d8ed1a39caf2867 + unpetrify-ref: baserock/genivi/genivi-demo-platform - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: 43fa65ede93cef9e6c902df2248229ad204b510a - unpetrify-ref: master + ref: bac7fc24bb94e37e33f447b58ec74240bb248841 + unpetrify-ref: 1.3.91 build-depends: - weston -- cgit v1.2.1