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