From 8089ee05d77128d50a0f8df73d322b5b11224e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 26 Aug 2014 18:20:18 +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