From c4315f3ed22c35c5d474b050e30f0e48528cf432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sat, 25 Oct 2014 14:26:53 +0000
Subject: strata/mesa-common/mesa: Clean configuration

Try to be as generic as possible and only make a few exceptions:
- Only build ARM-related drivers if we are in ARM, this is:
  nouveau,freedreno,vc4 (and svga,swrast as fallbacks)
- enable-gallium-egl only in ARM (needed by freedreno, nouveau)
- For the rest of the arquitectures, the drivers to build will be the
  default ones, this is:
  - DRI: i915 i965 nouveau r200 radeon swrast
  - Gallium: r300 r600 svga swrast
- enable GLES2 (disabled by default)
- disable GLX (enabled by default) to not pull x11 deps

The rest all the configure parameters will be automatically configured
by the mesa's configure.ac
---
 strata/mesa-common/mesa.morph | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

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