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/input-genivi.morph | 39 ++++++++++++++++++++++ strata/input-genivi/libxkbcommon-no-x11.morph | 12 +++++++ strata/input-genivi/xkeyboard-config.morph | 7 ++++ strata/weston-genivi.morph | 10 +++--- .../genivi-baseline-system-armv7lhf-jetson.morph | 4 +-- ...genivi-baseline-system-armv7lhf-versatile.morph | 4 +-- .../genivi-baseline-system-x86_64-generic.morph | 4 +-- 7 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 strata/input-genivi.morph create mode 100644 strata/input-genivi/libxkbcommon-no-x11.morph create mode 100644 strata/input-genivi/xkeyboard-config.morph diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph new file mode 100644 index 00000000..5e86e704 --- /dev/null +++ b/strata/input-genivi.morph @@ -0,0 +1,39 @@ +name: input-genivi +kind: stratum +description: | + Input components for GENIVI Demo Platform. GDP needs libinput 0.7, + because 0.8+ changed function signatures that weston uses. +build-depends: +- morph: strata/foundation.morph +- morph: strata/xorg-util-macros-common.morph +chunks: +- name: mtdev + repo: upstream:mtdev-git + ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d + unpetrify-ref: v1.1.5 + build-system: autotools +- name: xkeyboard-config + morph: strata/input-genivi/xkeyboard-config.morph + repo: upstream:xkeyboard-config + ref: 26f344c93f8c6141e9233eb68088ba4fd56bc9ef + unpetrify-ref: xkeyboard-config-2.14 +- name: libevdev + repo: upstream:libevdev + ref: 6f03fd49fb949e46ebccb5dfb54489584896c791 + unpetrify-ref: libevdev-1.4.2 + build-system: autotools +- name: libinput@genivi + repo: upstream:libinput + ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f + unpetrify-ref: 0.7.0 + build-system: autotools + build-depends: + - mtdev + - libevdev +- name: libxkbcommon-no-x11 + repo: upstream:xorg-lib-libxkbcommon + ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 + morph: strata/input-genivi/libxkbcommon-no-x11.morph + unpetrify-ref: xkbcommon-0.5.0 + build-depends: + - xkeyboard-config diff --git a/strata/input-genivi/libxkbcommon-no-x11.morph b/strata/input-genivi/libxkbcommon-no-x11.morph new file mode 100644 index 00000000..95165aaf --- /dev/null +++ b/strata/input-genivi/libxkbcommon-no-x11.morph @@ -0,0 +1,12 @@ +name: libxkbcommon-no-x11 +kind: chunk + +description: | + xkbcommon is a library to handle keyboard descriptions. + + This version is built without X11 support. If built with X11 support, + it depends on the xcb-xkb library. + +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-x11 diff --git a/strata/input-genivi/xkeyboard-config.morph b/strata/input-genivi/xkeyboard-config.morph new file mode 100644 index 00000000..2195befe --- /dev/null +++ b/strata/input-genivi/xkeyboard-config.morph @@ -0,0 +1,7 @@ +name: xkeyboard-config +kind: chunk +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-runtime-deps +install-commands: +- mkdir -p "$DESTDIR"/"$PREFIX"/share/X11/xkb/ +- make install DESTDIR="$DESTDIR" 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 diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 535696f6..d4ead848 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: mesa-common morph: strata/mesa-common.morph - name: x-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index c1425115..daf461d2 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: x-common morph: strata/x-common.morph - name: weston-genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index da0a1b3a..36fb42dd 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -31,8 +31,8 @@ strata: morph: strata/wayland-generic.morph - name: graphics-common morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph +- name: input-genivi + morph: strata/input-genivi.morph - name: llvm-common morph: strata/llvm-common.morph - name: mesa-common -- cgit v1.2.1