diff options
| author | Javier Jardón <jjardon@gnome.org> | 2014-10-01 18:50:25 +0000 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-10-10 14:18:30 -0500 |
| commit | 5c9df4ca6a369b752f255929c313431b2d3d03ef (patch) | |
| tree | afd9846495503b6103d27e50e1daa7afc9e4b537 /strata | |
| parent | 3d630aa165c5dfc5a0ef671e955ab188e56d3e33 (diff) | |
| download | definitions-5c9df4ca6a369b752f255929c313431b2d3d03ef.tar.gz | |
Do not build X11 support in mesa
In this way we can build completely wayland-only systems
The reason to do this is that cairo will pull the X11 dependency if the
mesa stratum is built with X11 support (as graphics-common depens on
mesa-common)
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/mesa-common.morph | 1 | ||||
| -rw-r--r-- | strata/mesa-common/mesa.morph | 5 | ||||
| -rw-r--r-- | strata/x-generic.morph | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 9be31a80..e2548e7d 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -2,7 +2,6 @@ name: mesa-common kind: stratum build-depends: - morph: strata/llvm-common.morph -- morph: strata/x-common.morph - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 9a528cbe..00b4c9c8 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -9,7 +9,7 @@ configure-commands: x86_32|x64_64) DRIDRIVERS=intel,i915,i965,swrast GALLIUMDRIVERS=swrast - EGLPLATFORMS=x11,wayland,drm + EGLPLATFORMS=wayland,drm ;; armv7lhf) DRIDRIVERS=nouveau,swrast @@ -20,12 +20,13 @@ configure-commands: *) DRIDRIVERS=swrast GALLIUMDRIVERS=swrast - EGLPLATFORMS=x11,wayland,drm + EGLPLATFORMS=wayland,drm ;; esac ./autogen.sh --prefix="$PREFIX" \ --enable-gles2 \ --with-egl-platforms="$EGLPLATFORMS" \ + --disable-glx \ --enable-gbm \ --enable-shared-glapi \ --with-gallium-drivers="$GALLIUMDRIVERS" \ diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 69e05400..af42c55e 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -3,7 +3,6 @@ kind: stratum build-depends: - morph: strata/foundation.morph - morph: strata/libdrm-common.morph -- morph: strata/mesa-common.morph - morph: strata/x-common.morph - morph: strata/graphics-common.morph chunks: |