From fa35f9272d937f67f73632d7b4b97491c93bd035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:10 +0100
Subject: Build only one wayland independent of the architecture

This makes gtk (and everything that is on top) independent of the
architecture we are building.
---
 strata/genivi-wayland-armv7-versatile.morph        |  15 ---
 strata/genivi-wayland-generic.morph                |  15 +++
 strata/genivi-wayland-x86_64-generic.morph         |  15 ---
 strata/gtk-deps.morph                              |   2 +-
 strata/gtk3.morph                                  |   2 +-
 strata/wayland-armv7-versatile.morph               | 136 ---------------------
 strata/wayland-armv7-versatile/cairo.morph         |   5 -
 strata/wayland-armv7-versatile/freefont-otf.morph  |   5 -
 .../linux-api-headers.morph                        |   9 --
 strata/wayland-armv7-versatile/mesa-wayland.morph  |   7 --
 .../wayland-ivi-extension.morph                    |   8 --
 strata/wayland-armv7-versatile/wayland.morph       |   7 --
 strata/wayland-armv7-versatile/weston.morph        |  53 --------
 strata/wayland-generic.morph                       | 135 ++++++++++++++++++++
 strata/wayland-generic/cairo.morph                 |   5 +
 strata/wayland-generic/freefont-otf.morph          |   5 +
 strata/wayland-generic/linux-api-headers.morph     |   9 ++
 strata/wayland-generic/mesa-wayland.morph          |   7 ++
 strata/wayland-generic/wayland-ivi-extension.morph |   8 ++
 strata/wayland-generic/wayland.morph               |   7 ++
 strata/wayland-generic/weston.morph                |  53 ++++++++
 strata/wayland-x86_64-generic.morph                | 136 ---------------------
 strata/wayland-x86_64-generic/cairo.morph          |   5 -
 strata/wayland-x86_64-generic/freefont-otf.morph   |   5 -
 .../wayland-x86_64-generic/linux-api-headers.morph |   9 --
 strata/wayland-x86_64-generic/mesa-wayland.morph   |   7 --
 .../wayland-ivi-extension.morph                    |   8 --
 strata/wayland-x86_64-generic/wayland.morph        |   7 --
 strata/wayland-x86_64-generic/weston.morph         |  53 --------
 ...genivi-baseline-system-armv7lhf-versatile.morph |   4 +-
 .../genivi-baseline-system-x86_64-generic.morph    |   4 +-
 31 files changed, 250 insertions(+), 496 deletions(-)
 delete mode 100644 strata/genivi-wayland-armv7-versatile.morph
 create mode 100644 strata/genivi-wayland-generic.morph
 delete mode 100644 strata/genivi-wayland-x86_64-generic.morph
 delete mode 100644 strata/wayland-armv7-versatile.morph
 delete mode 100644 strata/wayland-armv7-versatile/cairo.morph
 delete mode 100644 strata/wayland-armv7-versatile/freefont-otf.morph
 delete mode 100644 strata/wayland-armv7-versatile/linux-api-headers.morph
 delete mode 100644 strata/wayland-armv7-versatile/mesa-wayland.morph
 delete mode 100644 strata/wayland-armv7-versatile/wayland-ivi-extension.morph
 delete mode 100644 strata/wayland-armv7-versatile/wayland.morph
 delete mode 100644 strata/wayland-armv7-versatile/weston.morph
 create mode 100644 strata/wayland-generic.morph
 create mode 100644 strata/wayland-generic/cairo.morph
 create mode 100644 strata/wayland-generic/freefont-otf.morph
 create mode 100644 strata/wayland-generic/linux-api-headers.morph
 create mode 100644 strata/wayland-generic/mesa-wayland.morph
 create mode 100644 strata/wayland-generic/wayland-ivi-extension.morph
 create mode 100644 strata/wayland-generic/wayland.morph
 create mode 100644 strata/wayland-generic/weston.morph
 delete mode 100644 strata/wayland-x86_64-generic.morph
 delete mode 100644 strata/wayland-x86_64-generic/cairo.morph
 delete mode 100644 strata/wayland-x86_64-generic/freefont-otf.morph
 delete mode 100644 strata/wayland-x86_64-generic/linux-api-headers.morph
 delete mode 100644 strata/wayland-x86_64-generic/mesa-wayland.morph
 delete mode 100644 strata/wayland-x86_64-generic/wayland-ivi-extension.morph
 delete mode 100644 strata/wayland-x86_64-generic/wayland.morph
 delete mode 100644 strata/wayland-x86_64-generic/weston.morph

diff --git a/strata/genivi-wayland-armv7-versatile.morph b/strata/genivi-wayland-armv7-versatile.morph
deleted file mode 100644
index b61d861a..00000000
--- a/strata/genivi-wayland-armv7-versatile.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: genivi-wayland-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/genivi-foundation.morph
-- morph: strata/genivi.morph
-- morph: strata/wayland-armv7-versatile.morph
-chunks:
-- name: layer_management-wayland
-  repo: upstream:layer_management
-  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
diff --git a/strata/genivi-wayland-generic.morph b/strata/genivi-wayland-generic.morph
new file mode 100644
index 00000000..3f9eb240
--- /dev/null
+++ b/strata/genivi-wayland-generic.morph
@@ -0,0 +1,15 @@
+name: genivi-wayland-generic
+kind: stratum
+description: Software components designed by genivi, for genivi.
+build-depends:
+- morph: strata/core.morph
+- morph: strata/foundation.morph
+- morph: strata/genivi-foundation.morph
+- morph: strata/genivi.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: layer_management-wayland
+  repo: upstream:layer_management
+  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
diff --git a/strata/genivi-wayland-x86_64-generic.morph b/strata/genivi-wayland-x86_64-generic.morph
deleted file mode 100644
index eedbecc2..00000000
--- a/strata/genivi-wayland-x86_64-generic.morph
+++ /dev/null
@@ -1,15 +0,0 @@
-name: genivi-wayland-x86_64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: strata/core.morph
-- morph: strata/foundation.morph
-- morph: strata/genivi-foundation.morph
-- morph: strata/genivi.morph
-- morph: strata/wayland-x86_64-generic.morph
-chunks:
-- name: layer_management-wayland
-  repo: upstream:layer_management
-  ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 71637b17..0d9d7458 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -5,7 +5,7 @@ build-depends:
 - morph: strata/foundation.morph
 - morph: strata/x-common.morph
 - morph: strata/x-generic.morph
-- morph: strata/wayland-x86_64-generic.morph
+- morph: strata/wayland-generic.morph
 chunks:
 - name: shared-mime-info
   morph: strata/gtk-deps/shared-mime-info.morph
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 3452621d..d70c5b5f 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -4,7 +4,7 @@ description: the gtk3 stratum
 build-depends:
 - morph: strata/gtk-deps.morph
 - morph: strata/x-generic.morph
-- morph: strata/wayland-x86_64-generic.morph
+- morph: strata/wayland-generic.morph
 chunks:
 - name: gtk3
   morph: strata/gtk3/gtk3.morph
diff --git a/strata/wayland-armv7-versatile.morph b/strata/wayland-armv7-versatile.morph
deleted file mode 100644
index e9891869..00000000
--- a/strata/wayland-armv7-versatile.morph
+++ /dev/null
@@ -1,136 +0,0 @@
-name: wayland-armv7-versatile
-kind: stratum
-build-depends:
-- morph: strata/x-common.morph
-chunks:
-- name: libxkbcommon
-  repo: upstream:xorg-lib-libxkbcommon
-  ref: b721254769212d671a4729f1c88b059979b80efc
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: wayland
-  morph: strata/wayland-armv7-versatile/wayland.morph
-  repo: upstream:wayland
-  ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
-  unpetrify-ref: baserock/1.4.0
-  build-depends:
-  - libxkbcommon
-- name: mesa-wayland
-  morph: strata/wayland-armv7-versatile/mesa-wayland.morph
-  repo: upstream:mesa
-  ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
-  unpetrify-ref: baserock/arm/10.0.4-gallium
-  build-depends:
-  - wayland
-- name: pixman
-  repo: upstream:pixman
-  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: freetype2
-  repo: upstream:freetype2
-  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: fontconfig
-  repo: upstream:fontconfig
-  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - freetype2
-- name: freefont-otf
-  morph: strata/wayland-armv7-versatile/freefont-otf.morph
-  repo: upstream:freefont-otf
-  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: cairo
-  morph: strata/wayland-armv7-versatile/cairo.morph
-  repo: upstream:cairo
-  ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
-  unpetrify-ref: baserock/genivi/1.12.10
-  build-depends:
-  - fontconfig
-  - freetype2
-  - wayland
-  - mesa-wayland
-  - pixman
-- name: mtdev
-  repo: upstream:mtdev-git
-  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
-  ref: 705b9bbb426410f9510601c7010da51184919b36
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
-  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-app-xkbcomp
-- name: libevdev
-  repo: upstream:libevdev
-  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: linux-api-headers
-  morph: strata/wayland-armv7-versatile/linux-api-headers.morph
-  repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: libinput
-  repo: upstream:libinput
-  ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends:
-  - libxkbcommon
-  - mtdev
-  - libevdev
-  - linux-api-headers
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
-  unpetrify-ref: baserock/0.9.12
-  build-depends:
-  - freetype2
-- name: pango
-  repo: upstream:pango
-  ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
-  unpetrify-ref: baserock/1.36.3
-  build-depends:
-  - cairo
-  - harfbuzz
-  - fontconfig
-  - freetype2
-  - freefont-otf
-- name: weston
-  morph: strata/wayland-armv7-versatile/weston.morph
-  repo: upstream:weston
-  ref: 8658e06e69cc3944e89684a2de619e479751633f
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - pango
-  - pixman
-  - libxkbcommon
-  - wayland
-  - mesa-wayland
-  - libinput
-  - cairo
-- name: wayland-ivi-extension
-  morph: strata/wayland-armv7-versatile/wayland-ivi-extension.morph
-  repo: upstream:genivi/wayland-ivi-extension
-  ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - wayland
-  - weston
diff --git a/strata/wayland-armv7-versatile/cairo.morph b/strata/wayland-armv7-versatile/cairo.morph
deleted file mode 100644
index f91ac385..00000000
--- a/strata/wayland-armv7-versatile/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/wayland-armv7-versatile/freefont-otf.morph b/strata/wayland-armv7-versatile/freefont-otf.morph
deleted file mode 100644
index e5c6c482..00000000
--- a/strata/wayland-armv7-versatile/freefont-otf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: freefont-otf
-kind: chunk
-install-commands:
-- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
-- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/wayland-armv7-versatile/linux-api-headers.morph b/strata/wayland-armv7-versatile/linux-api-headers.morph
deleted file mode 100644
index 595138fe..00000000
--- a/strata/wayland-armv7-versatile/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-armv7-versatile/mesa-wayland.morph b/strata/wayland-armv7-versatile/mesa-wayland.morph
deleted file mode 100644
index f39c4241..00000000
--- a/strata/wayland-armv7-versatile/mesa-wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mesa-wayland
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm
-  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=swrast
-  --with-state-trackers=egl
diff --git a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph b/strata/wayland-armv7-versatile/wayland-ivi-extension.morph
deleted file mode 100644
index c3308ce7..00000000
--- a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install DESTDIR=$DESTDIR
diff --git a/strata/wayland-armv7-versatile/wayland.morph b/strata/wayland-armv7-versatile/wayland.morph
deleted file mode 100644
index 752a5d6e..00000000
--- a/strata/wayland-armv7-versatile/wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: wayland
-kind: chunk
-description: Wayland server
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/wayland-armv7-versatile/weston.morph b/strata/wayland-armv7-versatile/weston.morph
deleted file mode 100644
index 8ce58496..00000000
--- a/strata/wayland-armv7-versatile/weston.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: weston
-kind: chunk
-description: weston compositor
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- |
-  LDFLAGS='-L/lib64 -lrt' \
-  ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
-  --disable-drm-compositor  --disable-x11-compositor \
-  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
-  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
-post-install-commands:
-- install -d "$DESTDIR/usr/share/weston"
-- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
-- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
-- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
-- |
-  cat <<EOF >> ivi-shell/weston.ini
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4001
-  icon=/usr/share/weston/icon_ivi_flower.png
-  path=/usr/bin/weston-flower
-
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4002
-  icon=/usr/share/weston/icon_ivi_clickdot.png
-  path=/usr/bin/weston-clickdot
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4003
-  icon=/usr/share/weston/icon_ivi_simple-egl.png
-  path=/usr/bin/weston-simple-egl
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4004
-  icon=/usr/share/weston/icon_ivi_simple-shm.png
-  path=/usr/bin/weston-simple-shm
-
-  [ivi-launcher]
-  workspace-id=2
-  icon-id=4005
-  icon=/usr/share/weston/icon_ivi_smoke.png
-  path=/usr/bin/weston-smoke
-  EOF
-- install -d "$DESTDIR/usr/share/doc/weston"
-- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
new file mode 100644
index 00000000..5c5c825a
--- /dev/null
+++ b/strata/wayland-generic.morph
@@ -0,0 +1,135 @@
+name: wayland-generic
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+chunks:
+- name: libxkbcommon
+  repo: upstream:xorg-lib-libxkbcommon
+  ref: b721254769212d671a4729f1c88b059979b80efc
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: wayland
+  morph: strata/wayland-generic/wayland.morph
+  repo: upstream:wayland
+  ref: baserock/gnome
+  build-depends:
+  - libxkbcommon
+- name: mesa-wayland
+  morph: strata/wayland-generic/mesa-wayland.morph
+  repo: upstream:mesa
+  ref: a77b370b4ba1045e2612650503cf45827af94a12
+  unpetrify-ref: baserock/10.0.4-gallium
+  build-depends:
+  - wayland
+- name: pixman
+  repo: upstream:pixman
+  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: freetype2
+  repo: upstream:freetype2
+  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: fontconfig
+  repo: upstream:fontconfig
+  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: freefont-otf
+  morph: strata/wayland-generic/freefont-otf.morph
+  repo: upstream:freefont-otf
+  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: cairo
+  morph: strata/wayland-generic/cairo.morph
+  repo: upstream:cairo
+  ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+  unpetrify-ref: baserock/genivi/1.12.10
+  build-depends:
+  - fontconfig
+  - freetype2
+  - wayland
+  - mesa-wayland
+  - pixman
+- name: mtdev
+  repo: upstream:mtdev-git
+  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: 705b9bbb426410f9510601c7010da51184919b36
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
+  repo: upstream:xkeyboard-config
+  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: libevdev
+  repo: upstream:libevdev
+  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: linux-api-headers
+  morph: strata/wayland-generic/linux-api-headers.morph
+  repo: upstream:linux
+  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: libinput
+  repo: upstream:libinput
+  ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends:
+  - libxkbcommon
+  - mtdev
+  - libevdev
+  - linux-api-headers
+- name: harfbuzz
+  repo: upstream:harfbuzz
+  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+  unpetrify-ref: baserock/0.9.12
+  build-depends:
+  - freetype2
+- name: pango
+  repo: upstream:pango
+  ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+  unpetrify-ref: baserock/1.36.3
+  build-depends:
+  - cairo
+  - harfbuzz
+  - fontconfig
+  - freetype2
+  - freefont-otf
+- name: weston
+  morph: strata/wayland-generic/weston.morph
+  repo: upstream:weston
+  ref: 8658e06e69cc3944e89684a2de619e479751633f
+  unpetrify-ref: baserock/genivi/baseline-h-1.1
+  build-depends:
+  - pango
+  - wayland
+  - mesa-wayland
+  - libinput
+  - cairo
+  - pixman
+  - libxkbcommon
+- name: wayland-ivi-extension
+  morph: strata/wayland-generic/wayland-ivi-extension.morph
+  repo: upstream:genivi/wayland-ivi-extension
+  ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+  unpetrify-ref: baserock/genivi/baseline-h-1.1
+  build-depends:
+  - wayland
+  - weston
diff --git a/strata/wayland-generic/cairo.morph b/strata/wayland-generic/cairo.morph
new file mode 100644
index 00000000..f91ac385
--- /dev/null
+++ b/strata/wayland-generic/cairo.morph
@@ -0,0 +1,5 @@
+name: cairo
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/wayland-generic/freefont-otf.morph b/strata/wayland-generic/freefont-otf.morph
new file mode 100644
index 00000000..e5c6c482
--- /dev/null
+++ b/strata/wayland-generic/freefont-otf.morph
@@ -0,0 +1,5 @@
+name: freefont-otf
+kind: chunk
+install-commands:
+- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
+- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/wayland-generic/linux-api-headers.morph b/strata/wayland-generic/linux-api-headers.morph
new file mode 100644
index 00000000..595138fe
--- /dev/null
+++ b/strata/wayland-generic/linux-api-headers.morph
@@ -0,0 +1,9 @@
+name: linux-api-headers
+kind: chunk
+build-commands:
+- make mrproper
+- make headers_check
+install-commands:
+- make INSTALL_HDR_PATH=dest headers_install
+- install -d "$DESTDIR${PREFIX-/usr}/include"
+- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-generic/mesa-wayland.morph b/strata/wayland-generic/mesa-wayland.morph
new file mode 100644
index 00000000..06dfeee3
--- /dev/null
+++ b/strata/wayland-generic/mesa-wayland.morph
@@ -0,0 +1,7 @@
+name: mesa-wayland
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm
+  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast
+  --with-state-trackers=egl
diff --git a/strata/wayland-generic/wayland-ivi-extension.morph b/strata/wayland-generic/wayland-ivi-extension.morph
new file mode 100644
index 00000000..c3308ce7
--- /dev/null
+++ b/strata/wayland-generic/wayland-ivi-extension.morph
@@ -0,0 +1,8 @@
+name: wayland-ivi-extension
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+build-commands:
+- make
+install-commands:
+- make install DESTDIR=$DESTDIR
diff --git a/strata/wayland-generic/wayland.morph b/strata/wayland-generic/wayland.morph
new file mode 100644
index 00000000..752a5d6e
--- /dev/null
+++ b/strata/wayland-generic/wayland.morph
@@ -0,0 +1,7 @@
+name: wayland
+kind: chunk
+description: Wayland server
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/wayland-generic/weston.morph b/strata/wayland-generic/weston.morph
new file mode 100644
index 00000000..8ce58496
--- /dev/null
+++ b/strata/wayland-generic/weston.morph
@@ -0,0 +1,53 @@
+name: weston
+kind: chunk
+description: weston compositor
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- |
+  LDFLAGS='-L/lib64 -lrt' \
+  ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
+  --disable-drm-compositor  --disable-x11-compositor \
+  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
+  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
+post-install-commands:
+- install -d "$DESTDIR/usr/share/weston"
+- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
+- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
+- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
+- |
+  cat <<EOF >> ivi-shell/weston.ini
+  [ivi-launcher]
+  workspace-id=0
+  icon-id=4001
+  icon=/usr/share/weston/icon_ivi_flower.png
+  path=/usr/bin/weston-flower
+
+  [ivi-launcher]
+  workspace-id=0
+  icon-id=4002
+  icon=/usr/share/weston/icon_ivi_clickdot.png
+  path=/usr/bin/weston-clickdot
+
+  [ivi-launcher]
+  workspace-id=1
+  icon-id=4003
+  icon=/usr/share/weston/icon_ivi_simple-egl.png
+  path=/usr/bin/weston-simple-egl
+
+  [ivi-launcher]
+  workspace-id=1
+  icon-id=4004
+  icon=/usr/share/weston/icon_ivi_simple-shm.png
+  path=/usr/bin/weston-simple-shm
+
+  [ivi-launcher]
+  workspace-id=2
+  icon-id=4005
+  icon=/usr/share/weston/icon_ivi_smoke.png
+  path=/usr/bin/weston-smoke
+  EOF
+- install -d "$DESTDIR/usr/share/doc/weston"
+- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/strata/wayland-x86_64-generic.morph b/strata/wayland-x86_64-generic.morph
deleted file mode 100644
index 9827068f..00000000
--- a/strata/wayland-x86_64-generic.morph
+++ /dev/null
@@ -1,136 +0,0 @@
-name: wayland-x86_64-generic
-kind: stratum
-build-depends:
-- morph: strata/x-common.morph
-chunks:
-- name: libxkbcommon
-  repo: upstream:xorg-lib-libxkbcommon
-  ref: b721254769212d671a4729f1c88b059979b80efc
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: wayland
-  morph: strata/wayland-x86_64-generic/wayland.morph
-  repo: upstream:wayland
-  ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
-  unpetrify-ref: baserock/1.4.0
-  build-depends:
-  - libxkbcommon
-- name: mesa-wayland
-  morph: strata/wayland-x86_64-generic/mesa-wayland.morph
-  repo: upstream:mesa
-  ref: a77b370b4ba1045e2612650503cf45827af94a12
-  unpetrify-ref: baserock/10.0.4-gallium
-  build-depends:
-  - wayland
-- name: pixman
-  repo: upstream:pixman
-  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: freetype2
-  repo: upstream:freetype2
-  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: fontconfig
-  repo: upstream:fontconfig
-  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - freetype2
-- name: freefont-otf
-  morph: strata/wayland-x86_64-generic/freefont-otf.morph
-  repo: upstream:freefont-otf
-  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: cairo
-  morph: strata/wayland-x86_64-generic/cairo.morph
-  repo: upstream:cairo
-  ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
-  unpetrify-ref: baserock/genivi/1.12.10
-  build-depends:
-  - fontconfig
-  - freetype2
-  - wayland
-  - mesa-wayland
-  - pixman
-- name: mtdev
-  repo: upstream:mtdev-git
-  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
-  ref: 705b9bbb426410f9510601c7010da51184919b36
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
-  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-app-xkbcomp
-- name: libevdev
-  repo: upstream:libevdev
-  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: linux-api-headers
-  morph: strata/wayland-x86_64-generic/linux-api-headers.morph
-  repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: libinput
-  repo: upstream:libinput
-  ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends:
-  - libxkbcommon
-  - mtdev
-  - libevdev
-  - linux-api-headers
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
-  unpetrify-ref: baserock/0.9.12
-  build-depends:
-  - freetype2
-- name: pango
-  repo: upstream:pango
-  ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
-  unpetrify-ref: baserock/1.36.3
-  build-depends:
-  - cairo
-  - harfbuzz
-  - fontconfig
-  - freetype2
-  - freefont-otf
-- name: weston
-  morph: strata/wayland-x86_64-generic/weston.morph
-  repo: upstream:weston
-  ref: 8658e06e69cc3944e89684a2de619e479751633f
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - pango
-  - wayland
-  - mesa-wayland
-  - libinput
-  - cairo
-  - pixman
-  - libxkbcommon
-- name: wayland-ivi-extension
-  morph: strata/wayland-x86_64-generic/wayland-ivi-extension.morph
-  repo: upstream:genivi/wayland-ivi-extension
-  ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - wayland
-  - weston
diff --git a/strata/wayland-x86_64-generic/cairo.morph b/strata/wayland-x86_64-generic/cairo.morph
deleted file mode 100644
index f91ac385..00000000
--- a/strata/wayland-x86_64-generic/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/wayland-x86_64-generic/freefont-otf.morph b/strata/wayland-x86_64-generic/freefont-otf.morph
deleted file mode 100644
index e5c6c482..00000000
--- a/strata/wayland-x86_64-generic/freefont-otf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: freefont-otf
-kind: chunk
-install-commands:
-- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
-- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/wayland-x86_64-generic/linux-api-headers.morph b/strata/wayland-x86_64-generic/linux-api-headers.morph
deleted file mode 100644
index 595138fe..00000000
--- a/strata/wayland-x86_64-generic/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-x86_64-generic/mesa-wayland.morph b/strata/wayland-x86_64-generic/mesa-wayland.morph
deleted file mode 100644
index 06dfeee3..00000000
--- a/strata/wayland-x86_64-generic/mesa-wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mesa-wayland
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm
-  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast
-  --with-state-trackers=egl
diff --git a/strata/wayland-x86_64-generic/wayland-ivi-extension.morph b/strata/wayland-x86_64-generic/wayland-ivi-extension.morph
deleted file mode 100644
index c3308ce7..00000000
--- a/strata/wayland-x86_64-generic/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install DESTDIR=$DESTDIR
diff --git a/strata/wayland-x86_64-generic/wayland.morph b/strata/wayland-x86_64-generic/wayland.morph
deleted file mode 100644
index 752a5d6e..00000000
--- a/strata/wayland-x86_64-generic/wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: wayland
-kind: chunk
-description: Wayland server
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/wayland-x86_64-generic/weston.morph b/strata/wayland-x86_64-generic/weston.morph
deleted file mode 100644
index 8ce58496..00000000
--- a/strata/wayland-x86_64-generic/weston.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: weston
-kind: chunk
-description: weston compositor
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- |
-  LDFLAGS='-L/lib64 -lrt' \
-  ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
-  --disable-drm-compositor  --disable-x11-compositor \
-  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
-  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
-post-install-commands:
-- install -d "$DESTDIR/usr/share/weston"
-- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
-- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
-- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
-- |
-  cat <<EOF >> ivi-shell/weston.ini
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4001
-  icon=/usr/share/weston/icon_ivi_flower.png
-  path=/usr/bin/weston-flower
-
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4002
-  icon=/usr/share/weston/icon_ivi_clickdot.png
-  path=/usr/bin/weston-clickdot
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4003
-  icon=/usr/share/weston/icon_ivi_simple-egl.png
-  path=/usr/bin/weston-simple-egl
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4004
-  icon=/usr/share/weston/icon_ivi_simple-shm.png
-  path=/usr/bin/weston-simple-shm
-
-  [ivi-launcher]
-  workspace-id=2
-  icon-id=4005
-  icon=/usr/share/weston/icon_ivi_smoke.png
-  path=/usr/bin/weston-smoke
-  EOF
-- install -d "$DESTDIR/usr/share/doc/weston"
-- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 7844e429..f8409b04 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -23,8 +23,8 @@ strata:
   morph: strata/multimedia.morph
 - name: genivi
   morph: strata/genivi.morph
-- name: wayland-armv7-versatile
-  morph: strata/wayland-armv7-versatile.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 1e5e687c..10326469 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -23,8 +23,8 @@ strata:
   morph: strata/multimedia.morph
 - name: genivi
   morph: strata/genivi.morph
-- name: wayland-x86_64-generic
-  morph: strata/wayland-x86_64-generic.morph
+- name: wayland-generic
+  morph: strata/wayland-generic.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
-- 
cgit v1.2.1


From e0736b45a40321cb8b70ae5d4ff2d46b3dba41d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:11 +0100
Subject: Build a unique mesa with wayland and x11 support

---
 strata/wayland-generic.morph              | 12 ++++++------
 strata/wayland-generic/mesa-wayland.morph |  7 -------
 strata/wayland-generic/mesa.morph         |  7 +++++++
 strata/x-generic.morph                    |  8 ++++----
 strata/x-generic/mesa-x.morph             | 21 ---------------------
 strata/x-generic/mesa.morph               | 21 +++++++++++++++++++++
 6 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 strata/wayland-generic/mesa-wayland.morph
 create mode 100644 strata/wayland-generic/mesa.morph
 delete mode 100644 strata/x-generic/mesa-x.morph
 create mode 100644 strata/x-generic/mesa.morph

diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 5c5c825a..5c8313f2 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -14,11 +14,11 @@ chunks:
   ref: baserock/gnome
   build-depends:
   - libxkbcommon
-- name: mesa-wayland
-  morph: strata/wayland-generic/mesa-wayland.morph
+- name: mesa
+  morph: strata/wayland-generic/mesa.morph
   repo: upstream:mesa
-  ref: a77b370b4ba1045e2612650503cf45827af94a12
-  unpetrify-ref: baserock/10.0.4-gallium
+  ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c
+  unpetrify-ref: baserock/gnome
   build-depends:
   - wayland
 - name: pixman
@@ -52,7 +52,7 @@ chunks:
   - fontconfig
   - freetype2
   - wayland
-  - mesa-wayland
+  - mesa
   - pixman
 - name: mtdev
   repo: upstream:mtdev-git
@@ -120,7 +120,7 @@ chunks:
   build-depends:
   - pango
   - wayland
-  - mesa-wayland
+  - mesa
   - libinput
   - cairo
   - pixman
diff --git a/strata/wayland-generic/mesa-wayland.morph b/strata/wayland-generic/mesa-wayland.morph
deleted file mode 100644
index 06dfeee3..00000000
--- a/strata/wayland-generic/mesa-wayland.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mesa-wayland
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm
-  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast
-  --with-state-trackers=egl
diff --git a/strata/wayland-generic/mesa.morph b/strata/wayland-generic/mesa.morph
new file mode 100644
index 00000000..ea85006e
--- /dev/null
+++ b/strata/wayland-generic/mesa.morph
@@ -0,0 +1,7 @@
+name: mesa
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm,x11
+  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast
+  --with-state-trackers=egl
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 1f68e064..03d19daf 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -3,11 +3,11 @@ kind: stratum
 build-depends:
 - morph: strata/x-common.morph
 chunks:
-- name: mesa-x
-  morph: strata/x-generic/mesa-x.morph
+- name: mesa
+  morph: strata/x-generic/mesa.morph
   repo: upstream:mesa
   ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c
-  unpetrify-ref: baserock/genivi/morph
+  unpetrify-ref: baserock/gnome
   build-depends: []
 - name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
@@ -103,7 +103,7 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - libsha1
-  - mesa-x
+  - mesa
   - pixman
   - xorg-font-util
   - xorg-lib-libXaw
diff --git a/strata/x-generic/mesa-x.morph b/strata/x-generic/mesa-x.morph
deleted file mode 100644
index a5a51500..00000000
--- a/strata/x-generic/mesa-x.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: mesa-x
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
-  x86_32|x64_64)
-    DRIDRIVERS=intel,i915,i965,swrast
-    ;;
-  *)
-    DRIDRIVERS=swrast
-    ;;
-  esac
-  ./autogen.sh --prefix="$PREFIX" \
-  --enable-gles2 \
-  --disable-gallium-egl \
-  --with-egl-platforms=x11,drm \
-  --enable-gbm --enable-shared-glapi \
-  --with-gallium-drivers=swrast \
-  --with-dri-drivers=$DRIDRIVERS
diff --git a/strata/x-generic/mesa.morph b/strata/x-generic/mesa.morph
new file mode 100644
index 00000000..38078d12
--- /dev/null
+++ b/strata/x-generic/mesa.morph
@@ -0,0 +1,21 @@
+name: mesa
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  cpu=$(echo $TARGET | cut -d '-' -f 1)
+  case "$cpu" in
+  x86_32|x64_64)
+    DRIDRIVERS=intel,i915,i965,swrast
+    ;;
+  *)
+    DRIDRIVERS=swrast
+    ;;
+  esac
+  ./autogen.sh --prefix="$PREFIX" \
+  --enable-gles2 \
+  --disable-gallium-egl \
+  --with-egl-platforms=x11,drm,wayland \
+  --enable-gbm --enable-shared-glapi \
+  --with-gallium-drivers=swrast \
+  --with-dri-drivers=$DRIDRIVERS
-- 
cgit v1.2.1


From c3d6de72c552a95267c1815b4a1fcbe1199c0581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:12 +0100
Subject: Move weston to its own stratum

---
 strata/wayland-generic.morph                       | 21 ---------
 strata/wayland-generic/wayland-ivi-extension.morph |  8 ----
 strata/wayland-generic/weston.morph                | 53 ----------------------
 strata/weston-genivi.morph                         | 19 ++++++++
 strata/weston-genivi/wayland-ivi-extension.morph   |  8 ++++
 strata/weston-genivi/weston.morph                  | 53 ++++++++++++++++++++++
 ...genivi-baseline-system-armv7lhf-versatile.morph |  2 +
 .../genivi-baseline-system-x86_64-generic.morph    |  2 +
 8 files changed, 84 insertions(+), 82 deletions(-)
 delete mode 100644 strata/wayland-generic/wayland-ivi-extension.morph
 delete mode 100644 strata/wayland-generic/weston.morph
 create mode 100644 strata/weston-genivi.morph
 create mode 100644 strata/weston-genivi/wayland-ivi-extension.morph
 create mode 100644 strata/weston-genivi/weston.morph

diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 5c8313f2..8240f635 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -112,24 +112,3 @@ chunks:
   - fontconfig
   - freetype2
   - freefont-otf
-- name: weston
-  morph: strata/wayland-generic/weston.morph
-  repo: upstream:weston
-  ref: 8658e06e69cc3944e89684a2de619e479751633f
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - pango
-  - wayland
-  - mesa
-  - libinput
-  - cairo
-  - pixman
-  - libxkbcommon
-- name: wayland-ivi-extension
-  morph: strata/wayland-generic/wayland-ivi-extension.morph
-  repo: upstream:genivi/wayland-ivi-extension
-  ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
-  unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends:
-  - wayland
-  - weston
diff --git a/strata/wayland-generic/wayland-ivi-extension.morph b/strata/wayland-generic/wayland-ivi-extension.morph
deleted file mode 100644
index c3308ce7..00000000
--- a/strata/wayland-generic/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install DESTDIR=$DESTDIR
diff --git a/strata/wayland-generic/weston.morph b/strata/wayland-generic/weston.morph
deleted file mode 100644
index 8ce58496..00000000
--- a/strata/wayland-generic/weston.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: weston
-kind: chunk
-description: weston compositor
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- |
-  LDFLAGS='-L/lib64 -lrt' \
-  ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
-  --disable-drm-compositor  --disable-x11-compositor \
-  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
-  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
-post-install-commands:
-- install -d "$DESTDIR/usr/share/weston"
-- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
-- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
-- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
-- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
-- |
-  cat <<EOF >> ivi-shell/weston.ini
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4001
-  icon=/usr/share/weston/icon_ivi_flower.png
-  path=/usr/bin/weston-flower
-
-  [ivi-launcher]
-  workspace-id=0
-  icon-id=4002
-  icon=/usr/share/weston/icon_ivi_clickdot.png
-  path=/usr/bin/weston-clickdot
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4003
-  icon=/usr/share/weston/icon_ivi_simple-egl.png
-  path=/usr/bin/weston-simple-egl
-
-  [ivi-launcher]
-  workspace-id=1
-  icon-id=4004
-  icon=/usr/share/weston/icon_ivi_simple-shm.png
-  path=/usr/bin/weston-simple-shm
-
-  [ivi-launcher]
-  workspace-id=2
-  icon-id=4005
-  icon=/usr/share/weston/icon_ivi_smoke.png
-  path=/usr/bin/weston-smoke
-  EOF
-- install -d "$DESTDIR/usr/share/doc/weston"
-- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
new file mode 100644
index 00000000..356a5564
--- /dev/null
+++ b/strata/weston-genivi.morph
@@ -0,0 +1,19 @@
+name: weston-genivi
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: weston
+  morph: strata/weston-genivi/weston.morph
+  repo: upstream:weston
+  ref: 8658e06e69cc3944e89684a2de619e479751633f
+  unpetrify-ref: baserock/genivi/baseline-h-1.1
+  build-depends: []
+- name: wayland-ivi-extension
+  morph: strata/weston-genivi/wayland-ivi-extension.morph
+  repo: upstream:genivi/wayland-ivi-extension
+  ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+  unpetrify-ref: baserock/genivi/baseline-h-1.1
+  build-depends:
+  - weston
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
new file mode 100644
index 00000000..c3308ce7
--- /dev/null
+++ b/strata/weston-genivi/wayland-ivi-extension.morph
@@ -0,0 +1,8 @@
+name: wayland-ivi-extension
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+build-commands:
+- make
+install-commands:
+- make install DESTDIR=$DESTDIR
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
new file mode 100644
index 00000000..8ce58496
--- /dev/null
+++ b/strata/weston-genivi/weston.morph
@@ -0,0 +1,53 @@
+name: weston
+kind: chunk
+description: weston compositor
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- |
+  LDFLAGS='-L/lib64 -lrt' \
+  ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
+  --disable-drm-compositor  --disable-x11-compositor \
+  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
+  --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
+post-install-commands:
+- install -d "$DESTDIR/usr/share/weston"
+- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
+- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini
+- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini
+- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini
+- |
+  cat <<EOF >> ivi-shell/weston.ini
+  [ivi-launcher]
+  workspace-id=0
+  icon-id=4001
+  icon=/usr/share/weston/icon_ivi_flower.png
+  path=/usr/bin/weston-flower
+
+  [ivi-launcher]
+  workspace-id=0
+  icon-id=4002
+  icon=/usr/share/weston/icon_ivi_clickdot.png
+  path=/usr/bin/weston-clickdot
+
+  [ivi-launcher]
+  workspace-id=1
+  icon-id=4003
+  icon=/usr/share/weston/icon_ivi_simple-egl.png
+  path=/usr/bin/weston-simple-egl
+
+  [ivi-launcher]
+  workspace-id=1
+  icon-id=4004
+  icon=/usr/share/weston/icon_ivi_simple-shm.png
+  path=/usr/bin/weston-simple-shm
+
+  [ivi-launcher]
+  workspace-id=2
+  icon-id=4005
+  icon=/usr/share/weston/icon_ivi_smoke.png
+  path=/usr/bin/weston-smoke
+  EOF
+- install -d "$DESTDIR/usr/share/doc/weston"
+- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini"
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index f8409b04..82f99735 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/genivi.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
+- name: weston-genivi
+  morph: strata/weston-genivi.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 10326469..8747b3a2 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/genivi.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
+- name: weston-genivi
+  morph: strata/weston-genivi.morph
 configuration-extensions:
 - set-hostname
 - add-config-files
-- 
cgit v1.2.1


From 021367d3c00599e730af1c907fba071038b9b1c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:13 +0100
Subject: Move common graphics components from wayland-generic to an
 independent stratum

Basically pixman, cairo, pango and deps

These are common dependencies for weston and gtk/clutter
---
 strata/graphics-common.morph                       | 52 ++++++++++++++++++++++
 strata/graphics-common/freefont-otf.morph          |  5 +++
 strata/gtk-deps.morph                              |  4 +-
 strata/wayland-generic.morph                       | 49 --------------------
 strata/wayland-generic/cairo.morph                 |  5 ---
 strata/wayland-generic/freefont-otf.morph          |  5 ---
 strata/weston-genivi.morph                         |  1 +
 ...genivi-baseline-system-armv7lhf-versatile.morph |  2 +
 .../genivi-baseline-system-x86_64-generic.morph    |  2 +
 9 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 strata/graphics-common.morph
 create mode 100644 strata/graphics-common/freefont-otf.morph
 delete mode 100644 strata/wayland-generic/cairo.morph
 delete mode 100644 strata/wayland-generic/freefont-otf.morph

diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
new file mode 100644
index 00000000..bc1a7da7
--- /dev/null
+++ b/strata/graphics-common.morph
@@ -0,0 +1,52 @@
+name: graphics-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: pixman
+  repo: upstream:pixman
+  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: freetype2
+  repo: upstream:freetype2
+  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: fontconfig
+  repo: upstream:fontconfig
+  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: freefont-otf
+  morph: strata/graphics-common/freefont-otf.morph
+  repo: upstream:freefont-otf
+  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: cairo
+  repo: upstream:cairo
+  ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+  unpetrify-ref: baserock/genivi/1.12.10
+  build-depends:
+  - fontconfig
+  - freetype2
+  - pixman
+- name: harfbuzz
+  repo: upstream:harfbuzz
+  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+  unpetrify-ref: baserock/0.9.12
+  build-depends:
+  - freetype2
+- name: pango
+  repo: upstream:pango
+  ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+  unpetrify-ref: baserock/1.36.3
+  build-depends:
+  - cairo
+  - harfbuzz
+  - fontconfig
+  - freetype2
+  - freefont-otf
diff --git a/strata/graphics-common/freefont-otf.morph b/strata/graphics-common/freefont-otf.morph
new file mode 100644
index 00000000..e5c6c482
--- /dev/null
+++ b/strata/graphics-common/freefont-otf.morph
@@ -0,0 +1,5 @@
+name: freefont-otf
+kind: chunk
+install-commands:
+- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
+- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 0d9d7458..dbee2e69 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -3,9 +3,7 @@ kind: stratum
 description: the GTK+ dependencies stratum
 build-depends:
 - morph: strata/foundation.morph
-- morph: strata/x-common.morph
-- morph: strata/x-generic.morph
-- morph: strata/wayland-generic.morph
+- morph: strata/graphics-common.morph
 chunks:
 - name: shared-mime-info
   morph: strata/gtk-deps/shared-mime-info.morph
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 8240f635..6bc1518a 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -21,39 +21,6 @@ chunks:
   unpetrify-ref: baserock/gnome
   build-depends:
   - wayland
-- name: pixman
-  repo: upstream:pixman
-  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: freetype2
-  repo: upstream:freetype2
-  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: fontconfig
-  repo: upstream:fontconfig
-  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - freetype2
-- name: freefont-otf
-  morph: strata/wayland-generic/freefont-otf.morph
-  repo: upstream:freefont-otf
-  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: cairo
-  morph: strata/wayland-generic/cairo.morph
-  repo: upstream:cairo
-  ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
-  unpetrify-ref: baserock/genivi/1.12.10
-  build-depends:
-  - fontconfig
-  - freetype2
-  - wayland
-  - mesa
-  - pixman
 - name: mtdev
   repo: upstream:mtdev-git
   ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
@@ -96,19 +63,3 @@ chunks:
   - mtdev
   - libevdev
   - linux-api-headers
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
-  unpetrify-ref: baserock/0.9.12
-  build-depends:
-  - freetype2
-- name: pango
-  repo: upstream:pango
-  ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
-  unpetrify-ref: baserock/1.36.3
-  build-depends:
-  - cairo
-  - harfbuzz
-  - fontconfig
-  - freetype2
-  - freefont-otf
diff --git a/strata/wayland-generic/cairo.morph b/strata/wayland-generic/cairo.morph
deleted file mode 100644
index f91ac385..00000000
--- a/strata/wayland-generic/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/wayland-generic/freefont-otf.morph b/strata/wayland-generic/freefont-otf.morph
deleted file mode 100644
index e5c6c482..00000000
--- a/strata/wayland-generic/freefont-otf.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: freefont-otf
-kind: chunk
-install-commands:
-- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
-- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 356a5564..1f62b5af 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -1,6 +1,7 @@
 name: weston-genivi
 kind: stratum
 build-depends:
+- morph: strata/graphics-common.morph
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 82f99735..aec413dc 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/genivi.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 8747b3a2..711011c1 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -25,6 +25,8 @@ strata:
   morph: strata/genivi.morph
 - name: wayland-generic
   morph: strata/wayland-generic.morph
+- name: graphics-common
+  morph: strata/graphics-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- 
cgit v1.2.1


From 7bbdf1f098496546481db75fb37077776ee62aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:14 +0100
Subject: Move common input components from wayland-generic to input-common
 stratum

This is libinput library and deps

These are common dependencies to weston and clutter/gtk
---
 strata/input-common.morph                          | 45 ++++++++++++++++++++++
 strata/input-common/linux-api-headers.morph        |  9 +++++
 strata/wayland-generic.morph                       | 42 --------------------
 strata/wayland-generic/linux-api-headers.morph     |  9 -----
 strata/weston-genivi.morph                         |  1 +
 ...genivi-baseline-system-armv7lhf-versatile.morph |  2 +
 .../genivi-baseline-system-x86_64-generic.morph    |  2 +
 7 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 strata/input-common.morph
 create mode 100644 strata/input-common/linux-api-headers.morph
 delete mode 100644 strata/wayland-generic/linux-api-headers.morph

diff --git a/strata/input-common.morph b/strata/input-common.morph
new file mode 100644
index 00000000..d3831b47
--- /dev/null
+++ b/strata/input-common.morph
@@ -0,0 +1,45 @@
+name: input-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+chunks:
+- name: mtdev
+  repo: upstream:mtdev-git
+  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: xorg-app-xkbcomp
+  repo: upstream:xorg-app-xkbcomp
+  ref: 705b9bbb426410f9510601c7010da51184919b36
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
+  repo: upstream:xkeyboard-config
+  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: libevdev
+  repo: upstream:libevdev
+  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
+  unpetrify-ref: baserock/genivi/baseline
+  build-depends: []
+- name: linux-api-headers
+  morph: strata/input-common/linux-api-headers.morph
+  repo: upstream:linux
+  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: libinput
+  repo: upstream:libinput
+  ref: 0.5.0
+  build-depends:
+  - mtdev
+  - libevdev
+  - linux-api-headers
diff --git a/strata/input-common/linux-api-headers.morph b/strata/input-common/linux-api-headers.morph
new file mode 100644
index 00000000..595138fe
--- /dev/null
+++ b/strata/input-common/linux-api-headers.morph
@@ -0,0 +1,9 @@
+name: linux-api-headers
+kind: chunk
+build-commands:
+- make mrproper
+- make headers_check
+install-commands:
+- make INSTALL_HDR_PATH=dest headers_install
+- install -d "$DESTDIR${PREFIX-/usr}/include"
+- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 6bc1518a..d24ffccc 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -21,45 +21,3 @@ chunks:
   unpetrify-ref: baserock/gnome
   build-depends:
   - wayland
-- name: mtdev
-  repo: upstream:mtdev-git
-  ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
-  ref: 705b9bbb426410f9510601c7010da51184919b36
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
-  ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xorg-app-xkbcomp
-- name: libevdev
-  repo: upstream:libevdev
-  ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends: []
-- name: linux-api-headers
-  morph: strata/wayland-generic/linux-api-headers.morph
-  repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: libinput
-  repo: upstream:libinput
-  ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
-  unpetrify-ref: baserock/genivi/baseline
-  build-depends:
-  - libxkbcommon
-  - mtdev
-  - libevdev
-  - linux-api-headers
diff --git a/strata/wayland-generic/linux-api-headers.morph b/strata/wayland-generic/linux-api-headers.morph
deleted file mode 100644
index 595138fe..00000000
--- a/strata/wayland-generic/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 1f62b5af..c29020a1 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -2,6 +2,7 @@ name: weston-genivi
 kind: stratum
 build-depends:
 - morph: strata/graphics-common.morph
+- morph: strata/input-common.morph
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index aec413dc..7c283170 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 711011c1..1ebefaeb 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/wayland-generic.morph
 - name: graphics-common
   morph: strata/graphics-common.morph
+- name: input-common
+  morph: strata/input-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- 
cgit v1.2.1


From ae380fa19f904931f173089ee0e98a33a0e8b41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:15 +0100
Subject: Do not build the same mesa in different strata, move to its own
 stratum

---
 strata/graphics-common.morph      |  1 +
 strata/mesa-common.morph          | 10 ++++++++++
 strata/mesa-common/mesa.morph     | 21 +++++++++++++++++++++
 strata/wayland-generic.morph      |  7 -------
 strata/wayland-generic/mesa.morph |  7 -------
 strata/weston-genivi.morph        |  1 +
 strata/x-generic.morph            |  8 +-------
 strata/x-generic/mesa.morph       | 21 ---------------------
 8 files changed, 34 insertions(+), 42 deletions(-)
 create mode 100644 strata/mesa-common.morph
 create mode 100644 strata/mesa-common/mesa.morph
 delete mode 100644 strata/wayland-generic/mesa.morph
 delete mode 100644 strata/x-generic/mesa.morph

diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index bc1a7da7..279ede02 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -1,6 +1,7 @@
 name: graphics-common
 kind: stratum
 build-depends:
+- morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
new file mode 100644
index 00000000..b5a3ec6c
--- /dev/null
+++ b/strata/mesa-common.morph
@@ -0,0 +1,10 @@
+name: mesa-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: mesa
+  repo: upstream:mesa
+  ref: baserock/unified
+  build-depends: []
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
new file mode 100644
index 00000000..38078d12
--- /dev/null
+++ b/strata/mesa-common/mesa.morph
@@ -0,0 +1,21 @@
+name: mesa
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  cpu=$(echo $TARGET | cut -d '-' -f 1)
+  case "$cpu" in
+  x86_32|x64_64)
+    DRIDRIVERS=intel,i915,i965,swrast
+    ;;
+  *)
+    DRIDRIVERS=swrast
+    ;;
+  esac
+  ./autogen.sh --prefix="$PREFIX" \
+  --enable-gles2 \
+  --disable-gallium-egl \
+  --with-egl-platforms=x11,drm,wayland \
+  --enable-gbm --enable-shared-glapi \
+  --with-gallium-drivers=swrast \
+  --with-dri-drivers=$DRIDRIVERS
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index d24ffccc..e21a5d5d 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -14,10 +14,3 @@ chunks:
   ref: baserock/gnome
   build-depends:
   - libxkbcommon
-- name: mesa
-  morph: strata/wayland-generic/mesa.morph
-  repo: upstream:mesa
-  ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c
-  unpetrify-ref: baserock/gnome
-  build-depends:
-  - wayland
diff --git a/strata/wayland-generic/mesa.morph b/strata/wayland-generic/mesa.morph
deleted file mode 100644
index ea85006e..00000000
--- a/strata/wayland-generic/mesa.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: mesa
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm,x11
-  --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast
-  --with-state-trackers=egl
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index c29020a1..569f69b5 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -3,6 +3,7 @@ kind: stratum
 build-depends:
 - morph: strata/graphics-common.morph
 - morph: strata/input-common.morph
+- morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 03d19daf..13cf8747 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -1,14 +1,9 @@
 name: x-generic
 kind: stratum
 build-depends:
+- morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
 chunks:
-- name: mesa
-  morph: strata/x-generic/mesa.morph
-  repo: upstream:mesa
-  ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c
-  unpetrify-ref: baserock/gnome
-  build-depends: []
 - name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
   ref: 7381c2f9013ef7784c78091fa671e652a62ca706
@@ -103,7 +98,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - libsha1
-  - mesa
   - pixman
   - xorg-font-util
   - xorg-lib-libXaw
diff --git a/strata/x-generic/mesa.morph b/strata/x-generic/mesa.morph
deleted file mode 100644
index 38078d12..00000000
--- a/strata/x-generic/mesa.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: mesa
-kind: chunk
-build-system: autotools
-configure-commands:
-- |
-  cpu=$(echo $TARGET | cut -d '-' -f 1)
-  case "$cpu" in
-  x86_32|x64_64)
-    DRIDRIVERS=intel,i915,i965,swrast
-    ;;
-  *)
-    DRIDRIVERS=swrast
-    ;;
-  esac
-  ./autogen.sh --prefix="$PREFIX" \
-  --enable-gles2 \
-  --disable-gallium-egl \
-  --with-egl-platforms=x11,drm,wayland \
-  --enable-gbm --enable-shared-glapi \
-  --with-gallium-drivers=swrast \
-  --with-dri-drivers=$DRIDRIVERS
-- 
cgit v1.2.1


From 0eedc523dd8281ea482cf4ba94422aa4706aadf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:16 +0100
Subject: weston.morph: Do not disable weston-launch

---
 strata/weston-genivi.morph        | 7 ++++++-
 strata/weston-genivi/weston.morph | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 569f69b5..735f8076 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -7,12 +7,17 @@ build-depends:
 - morph: strata/x-common.morph
 - morph: strata/wayland-generic.morph
 chunks:
+- name: linux-pam
+  repo: upstream:linux-pam
+  ref: master
+  build-depends: []
 - name: weston
   morph: strata/weston-genivi/weston.morph
   repo: upstream:weston
   ref: 8658e06e69cc3944e89684a2de619e479751633f
   unpetrify-ref: baserock/genivi/baseline-h-1.1
-  build-depends: []
+  build-depends:
+  - linux-pam
 - name: wayland-ivi-extension
   morph: strata/weston-genivi/wayland-ivi-extension.morph
   repo: upstream:genivi/wayland-ivi-extension
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index 8ce58496..5def796e 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -8,7 +8,7 @@ configure-commands:
   LDFLAGS='-L/lib64 -lrt' \
   ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
   --disable-drm-compositor  --disable-x11-compositor \
-  --disable-wayland-compositor  --disable-weston-launch --enable-egl \
+  --disable-wayland-compositor  --enable-egl \
   --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
 post-install-commands:
 - install -d "$DESTDIR/usr/share/weston"
-- 
cgit v1.2.1


From f14acc5693ee3c48da32ff20cd1ee49d16f9bc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:17 +0100
Subject: weston: Do not disable drm backend

Its the default backend and probably the best supported
---
 strata/weston-genivi/weston.morph                   | 2 +-
 systems/genivi-baseline-system-x86_64-generic.morph | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index 5def796e..892adfb4 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -7,7 +7,7 @@ configure-commands:
 - |
   LDFLAGS='-L/lib64 -lrt' \
   ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
-  --disable-drm-compositor  --disable-x11-compositor \
+  --disable-x11-compositor \
   --disable-wayland-compositor  --enable-egl \
   --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
 post-install-commands:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 1ebefaeb..fe7447ee 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -29,6 +29,8 @@ strata:
   morph: strata/graphics-common.morph
 - name: input-common
   morph: strata/input-common.morph
+- name: mesa-common
+  morph: strata/mesa-common.morph
 - name: weston-genivi
   morph: strata/weston-genivi.morph
 configuration-extensions:
-- 
cgit v1.2.1


From 076a69727e8b2b3495fc15e8215f915ef8bacd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:18 +0100
Subject: mesa.morph: Indent configure arguments

---
 strata/mesa-common/mesa.morph | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 38078d12..733e1b1f 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -13,9 +13,10 @@ configure-commands:
     ;;
   esac
   ./autogen.sh --prefix="$PREFIX" \
-  --enable-gles2 \
-  --disable-gallium-egl \
-  --with-egl-platforms=x11,drm,wayland \
-  --enable-gbm --enable-shared-glapi \
-  --with-gallium-drivers=swrast \
-  --with-dri-drivers=$DRIDRIVERS
+      --enable-gles2 \
+      --disable-gallium-egl \
+      --with-egl-platforms=x11,drm,wayland \
+      --enable-gbm \
+      --enable-shared-glapi \
+      --with-gallium-drivers=swrast \
+      --with-dri-drivers="$DRIDRIVERS"
-- 
cgit v1.2.1


From 6b50da00ab1d1435b85e40d8345e209c8c36f3df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:19 +0100
Subject: freefont-otf.morph: quote $DESTDIR

---
 strata/graphics-common/freefont-otf.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/graphics-common/freefont-otf.morph b/strata/graphics-common/freefont-otf.morph
index e5c6c482..f021480d 100644
--- a/strata/graphics-common/freefont-otf.morph
+++ b/strata/graphics-common/freefont-otf.morph
@@ -1,5 +1,5 @@
 name: freefont-otf
 kind: chunk
 install-commands:
-- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont
-- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont
+- mkdir -p "$DESTDIR"/usr/share/fonts/opentype/freefont
+- install -p *.otf "$DESTDIR"/usr/share/fonts/opentype/freefont
-- 
cgit v1.2.1


From 2dd1221be7a51124ac10c8b78111e31fba0f8549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:20 +0100
Subject: input-common: linux-api-headers is already in build-essential

---
 strata/input-common.morph                   | 8 +-------
 strata/input-common/linux-api-headers.morph | 9 ---------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 strata/input-common/linux-api-headers.morph

diff --git a/strata/input-common.morph b/strata/input-common.morph
index d3831b47..f8680849 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -1,6 +1,7 @@
 name: input-common
 kind: stratum
 build-depends:
+- morph: strata/build-essential.morph
 - morph: strata/x-common.morph
 chunks:
 - name: mtdev
@@ -30,16 +31,9 @@ chunks:
   ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
   unpetrify-ref: baserock/genivi/baseline
   build-depends: []
-- name: linux-api-headers
-  morph: strata/input-common/linux-api-headers.morph
-  repo: upstream:linux
-  ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: libinput
   repo: upstream:libinput
   ref: 0.5.0
   build-depends:
   - mtdev
   - libevdev
-  - linux-api-headers
diff --git a/strata/input-common/linux-api-headers.morph b/strata/input-common/linux-api-headers.morph
deleted file mode 100644
index 595138fe..00000000
--- a/strata/input-common/linux-api-headers.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: linux-api-headers
-kind: chunk
-build-commands:
-- make mrproper
-- make headers_check
-install-commands:
-- make INSTALL_HDR_PATH=dest headers_install
-- install -d "$DESTDIR${PREFIX-/usr}/include"
-- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include"
-- 
cgit v1.2.1


From a7d16e0cc2f467d79a32af2dd9489b2f0cedc5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Aug 2014 01:22:21 +0100
Subject: wayland-ivi-extension: Remove morph file as this uses standard cmake

---
 strata/weston-genivi.morph                       | 1 -
 strata/weston-genivi/wayland-ivi-extension.morph | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 strata/weston-genivi/wayland-ivi-extension.morph

diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 735f8076..5d1c9ab1 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -19,7 +19,6 @@ chunks:
   build-depends:
   - linux-pam
 - name: wayland-ivi-extension
-  morph: strata/weston-genivi/wayland-ivi-extension.morph
   repo: upstream:genivi/wayland-ivi-extension
   ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
   unpetrify-ref: baserock/genivi/baseline-h-1.1
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
deleted file mode 100644
index c3308ce7..00000000
--- a/strata/weston-genivi/wayland-ivi-extension.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: wayland-ivi-extension
-kind: chunk
-configure-commands:
-- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
-build-commands:
-- make
-install-commands:
-- make install DESTDIR=$DESTDIR
-- 
cgit v1.2.1