From 6192396b0515942344298b38d7bf906a6f60df77 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 3 Oct 2014 14:16:20 +0100
Subject: Enable nouveau drivers in mesa

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

diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 44a9af85..9a528cbe 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -4,19 +4,31 @@ build-system: autotools
 configure-commands:
 - |
   cpu=$(echo $TARGET | cut -d '-' -f 1)
+  EXTRAARGS=--disable-gallium-egl
   case "$cpu" in
   x86_32|x64_64)
-    DRIDRIVERS=i915,i965,swrast,nouveau
+    DRIDRIVERS=intel,i915,i965,swrast
+    GALLIUMDRIVERS=swrast
+    EGLPLATFORMS=x11,wayland,drm
+    ;;
+  armv7lhf)
+    DRIDRIVERS=nouveau,swrast
+    GALLIUMDRIVERS=nouveau,swrast
+    EXTRAARGS="--with-state-trackers=egl --enable-gallium-egl"
+    EGLPLATFORMS=wayland,drm
     ;;
   *)
-    DRIDRIVERS=swrast,nouveau
+    DRIDRIVERS=swrast
+    GALLIUMDRIVERS=swrast
+    EGLPLATFORMS=x11,wayland,drm
     ;;
   esac
   ./autogen.sh --prefix="$PREFIX" \
       --enable-gles2 \
-      --disable-gallium-egl \
-      --with-egl-platforms=x11,drm,wayland \
+      --with-egl-platforms="$EGLPLATFORMS" \
       --enable-gbm \
       --enable-shared-glapi \
-      --with-gallium-drivers=swrast \
-      --with-dri-drivers="$DRIDRIVERS"
+      --with-gallium-drivers="$GALLIUMDRIVERS" \
+      --with-dri-drivers="$DRIDRIVERS" \
+      --disable-dri3 $EXTRAARGS
+
-- 
cgit v1.2.1