From 1c706b743dcdca3b07e2f3f696791f491e4b1343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 1 Oct 2014 18:50:25 +0000 Subject: 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) --- strata/mesa-common.morph | 1 - strata/mesa-common/mesa.morph | 5 +++-- strata/x-generic.morph | 1 - systems/genivi-baseline-system-armv7lhf-versatile.morph | 2 -- systems/genivi-baseline-system-x86_64-generic.morph | 2 -- 5 files changed, 3 insertions(+), 8 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: diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 5ccf5196..52f04234 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,8 +19,6 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index d32bd2ba..a5646a63 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,8 +19,6 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia -- cgit v1.2.1