summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-07 10:31:38 +0100
committerJavier Jardón <jjardon@gnome.org>2014-08-07 15:03:27 +0100
commit92b948e8c993e55af3d4e58eb2245c8d0d719fb3 (patch)
treeaa833a87f664ad2762f0d3a18ebf2bc3e7578bd9
parente8bbcf9e52fbb3952690b9866e0edc83ffdc3cbe (diff)
downloadmesa-baserock/unified.tar.gz
Build a unique mesa with wayland and X11 supportbaserock/unified
-rw-r--r--mesa-wayland.morph22
-rw-r--r--mesa.morph (renamed from mesa-x.morph)4
2 files changed, 2 insertions, 24 deletions
diff --git a/mesa-wayland.morph b/mesa-wayland.morph
deleted file mode 100644
index 7f51683be79..00000000000
--- a/mesa-wayland.morph
+++ /dev/null
@@ -1,22 +0,0 @@
-name: mesa-wayland
-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=wayland,drm \
- --enable-gbm --enable-shared-glapi \
- --with-gallium-drivers=swrast \
- --with-dri-drivers=$DRIDRIVERS
diff --git a/mesa-x.morph b/mesa.morph
index 1076b28406d..0301887e043 100644
--- a/mesa-x.morph
+++ b/mesa.morph
@@ -1,4 +1,4 @@
-name: mesa-x
+name: mesa
kind: chunk
build-system: autotools
@@ -16,7 +16,7 @@ configure-commands:
./autogen.sh --prefix="$PREFIX" \
--enable-gles2 \
--disable-gallium-egl \
- --with-egl-platforms=x11,drm \
+ --with-egl-platforms=x11,drm,wayland \
--enable-gbm --enable-shared-glapi \
--with-gallium-drivers=swrast \
--with-dri-drivers=$DRIDRIVERS