From dd76470b8e0a262709b79b68c8a81ba7183e4b9a Mon Sep 17 00:00:00 2001
From: Jonathan Maw <jonathan.maw@codethink.co.uk>
Date: Mon, 13 Apr 2015 16:16:51 +0000
Subject: Add genivi-demo-platform-hmi and fix navit

---
 strata/genivi-demo-platform.morph                  |  9 +++++++++
 .../genivi-demo-platform-hmi.morph                 | 23 ++++++++++++++++++++++
 strata/genivi-demo-platform/navit.morph            |  5 +++++
 strata/weston-genivi.morph                         |  8 ++++----
 4 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
 create mode 100644 strata/genivi-demo-platform/navit.morph

diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index 721d4830..ef119ef8 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -7,6 +7,8 @@ build-depends:
 - morph: strata/qt5-tools-qtmultimedia.morph
 - morph: strata/qt5-tools-qtwebkit.morph
 - morph: strata/genivi.morph
+- morph: strata/wayland-generic.morph
+- morph: strata/weston-genivi.morph
 chunks:
 - name: mm-common
   morph: strata/genivi-demo-platform/mm-common.morph
@@ -100,3 +102,10 @@ chunks:
 #  - navit
 #  - poi-service
 #  - automotive-message-broker
+- name: genivi-demo-platform-hmi
+  morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+  repo: upstream:genivi/genivi-demo-platform-hmi
+  ref: baserock/jonathanmaw/genivi-demo-jetson
+  unpetrify-ref: 3955d0dd4a544577f812854ef333ddb80dbc177f
+  build-depends:
+  - dbus-c++
diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
new file mode 100644
index 00000000..953d4dff
--- /dev/null
+++ b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
@@ -0,0 +1,23 @@
+name: genivi-demo-platform-hmi
+kind: chunk
+pre-configure-commands:
+- |
+  git apply - << "EOF"
+  diff --git a/configure.ac b/configure.ac
+  index f0c7ba2..4ff1462 100644
+  --- a/configure.ac
+  +++ b/configure.ac
+  @@ -61,10 +61,10 @@ PKG_CHECK_MODULES([CLIENT], [
+   AC_CHECK_HEADERS([ilm/ilm_types.h])
+   AC_CHECK_LIB(ilmClient, ilm_UpdateInputEventAcceptanceOn,
+   	[ILM_LIBS="-lilmCommon -lilmClient"],
+  -	[AC_MSG_ERROR([Can't find correct ilmClient library.])])
+  +	[AC_MSG_ERROR([Can't find correct ilmClient library.])], -lilmControl)
+   AC_CHECK_LIB(ilmControl, ilm_SetKeyboardFocusOn,
+   	[ILM_LIBS="$ILM_LIBS -lilmControl"],
+  -	[AC_MSG_ERROR([Can't find correct ilmControl library.])])
+  +	[AC_MSG_ERROR([Can't find correct ilmControl library.])], -lilmClient)
+   AC_SUBST(ILM_LIBS)
+   
+   WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
+  EOF
diff --git a/strata/genivi-demo-platform/navit.morph b/strata/genivi-demo-platform/navit.morph
new file mode 100644
index 00000000..2bdb09d5
--- /dev/null
+++ b/strata/genivi-demo-platform/navit.morph
@@ -0,0 +1,5 @@
+name: navit
+kind: chunk
+build-system: cmake
+configure-commands:
+- cmake . -DSAMPLE_MAP=n
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index ea619821..10919c79 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.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: dbd8606a2a9425605102db9e722289934ab7b8b4
+  unpetrify-ref: 1.7.0
 - name: wayland-ivi-extension
   morph: strata/weston-genivi/wayland-ivi-extension.morph
   repo: upstream:genivi/wayland-ivi-extension
-  ref: 43fa65ede93cef9e6c902df2248229ad204b510a
-  unpetrify-ref: master
+  ref: a4bde3e5a4c21ff7cf28cc027d45d7c63cac2f66
+  unpetrify-ref: 1.3.0
   build-depends:
   - weston
-- 
cgit v1.2.1