From c36e7863e1f5bc88003127d6f2b2a7d30536c330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 3 Feb 2015 15:15:41 +0000
Subject: Build with cairo, mesa and GTK+ with X11 support

The GTK+/cairo X11 backend Its needed by some GNOME libraries (like gnome-sesion)
GL is needed by gnome-session (GLES is not enough)
---
 strata/gtk3.morph              | 1 +
 strata/gtk3/gtk3.morph         | 2 +-
 strata/mesa-common.morph       | 1 +
 strata/mesa-common/mesa.morph  | 3 +--
 strata/x-generic/xserver.morph | 1 -
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 851cb3dd..736c0c24 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -4,6 +4,7 @@ description: the gtk3 stratum
 build-depends:
 - morph: strata/gtk-deps.morph
 - morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
 chunks:
 - name: libepoxy
   repo: upstream:libepoxy
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph
index 4542dc15..76007474 100644
--- a/strata/gtk3/gtk3.morph
+++ b/strata/gtk3/gtk3.morph
@@ -4,7 +4,7 @@ build-system: autotools
 configure-commands:
 - gdk-pixbuf-query-loaders > loader.cache
 - NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --enable-wayland-backend
+- ./configure --prefix="$PREFIX"
 build-commands:
 - GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
 install-commands:
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index efae2449..6f195a1d 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -4,6 +4,7 @@ build-depends:
 - morph: strata/llvm-common.morph
 - morph: strata/libdrm-common.morph
 - morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
 chunks:
 - name: mesa
   morph: strata/mesa-common/mesa.morph
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 4194acc2..be0cee6f 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -16,8 +16,7 @@ configure-commands:
   esac
   ./autogen.sh --prefix="$PREFIX" \
       --enable-gles2 \
-      --disable-glx \
-      --with-egl-platforms=drm,wayland \
+      --with-egl-platforms=drm,wayland,x11 \
       --with-gallium-drivers="$GALLIUMDRIVERS" \
       --with-dri-drivers="$DRIDRIVERS" \
       --enable-gallium-egl
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index ca678331..9f734af3 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -4,7 +4,6 @@ build-system: autotools
 configure-commands:
 - |
   ./autogen.sh --prefix="$PREFIX" \
-  --disable-glx \
   --disable-xorg \
   --disable-xvfb \
   --disable-xnest \
-- 
cgit v1.2.1