diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-07-25 13:17:07 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-07-25 13:17:07 +0000 |
| commit | b8e3777eb34a6f585d7c168003bd8ebd69bf107c (patch) | |
| tree | 161e0bd402f32d00f443d74e1485ea4c80dc63a8 | |
| parent | f64dd91f4f2a2591e66b38fdfdfa83077f8221ab (diff) | |
| parent | 29474313db473f2ca79381e721a3ebc34b3be780 (diff) | |
| download | mesa-baserock/genivi/morph.tar.gz | |
Merge Emmet's changes to consolidate Mesa buildingbaserock/genivi/morph
| -rw-r--r-- | mesa-wayland.morph | 30 | ||||
| -rw-r--r-- | mesa-x.morph | 30 |
2 files changed, 44 insertions, 16 deletions
diff --git a/mesa-wayland.morph b/mesa-wayland.morph index 545e4b11298..7f51683be79 100644 --- a/mesa-wayland.morph +++ b/mesa-wayland.morph @@ -1,8 +1,22 @@ -{ - "name": "mesa-wayland", - "kind": "chunk", - "build-system": "autotools", - "configure-commands": [ - "./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=intel,i915,i965,swrast" - ] -} +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-x.morph index 7dc57638401..1076b28406d 100644 --- a/mesa-x.morph +++ b/mesa-x.morph @@ -1,8 +1,22 @@ -{ - "name": "mesa-x", - "kind": "chunk", - "build-system": "autotools", - "configure-commands": [ - "./autogen.sh --prefix=\"$PREFIX\" --enable-gles2 --disable-gallium-egl --with-egl-platforms=x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=intel,i915,i965,swrast" - ] -} +name: mesa-x +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=x11,drm \ + --enable-gbm --enable-shared-glapi \ + --with-gallium-drivers=swrast \ + --with-dri-drivers=$DRIDRIVERS |