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