summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-04-27 14:57:49 +0000
committerJavier Jardón <jjardon@gnome.org>2015-04-30 11:08:17 +0000
commit9451f889b0dff37ccb801fb2f24907b2eed84746 (patch)
tree17f8547fda1120a80a64fe44c41217ac20435879
parentf8f9da28f93aa0ce767fad3b118085a66a396cb3 (diff)
downloaddefinitions-9451f889b0dff37ccb801fb2f24907b2eed84746.tar.gz
Add mesa-common-vm and use this for x86_64 systems
We're locked at the last version of mesa that allows egl_gallium as we need to be able to use this in a VM, so add a separate run-time mesa for this. At build-time we can use the upgraded mesa Change-Id: I687fa98e12d99816efce2b61561cc8a07aa146f5
-rw-r--r--strata/mesa-common-vm.morph12
-rw-r--r--strata/mesa-common/mesa@vm.morph12
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph4
-rw-r--r--systems/weston-system-x86_64-generic.morph4
4 files changed, 28 insertions, 4 deletions
diff --git a/strata/mesa-common-vm.morph b/strata/mesa-common-vm.morph
new file mode 100644
index 00000000..47394dea
--- /dev/null
+++ b/strata/mesa-common-vm.morph
@@ -0,0 +1,12 @@
+name: mesa-common-vm
+kind: stratum
+build-depends:
+- morph: strata/llvm-common.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: mesa@vm
+ morph: strata/mesa-common/mesa@vm.morph
+ repo: upstream:mesa
+ ref: f7d157a4f011fd5ace94f55c8674be4b12d86f95
+ unpetrify-ref: baserock/mesa-10.3.7-2-gf7d157a/fstat_fix
diff --git a/strata/mesa-common/mesa@vm.morph b/strata/mesa-common/mesa@vm.morph
new file mode 100644
index 00000000..517b6ba4
--- /dev/null
+++ b/strata/mesa-common/mesa@vm.morph
@@ -0,0 +1,12 @@
+name: mesa@vm
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+ ./autogen.sh --prefix="$PREFIX" \
+ --enable-gles2 \
+ --disable-glx \
+ --with-egl-platforms=drm,wayland \
+ --with-gallium-drivers="yes" \
+ --with-dri-drivers="yes" \
+ --enable-gallium-egl
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index f04485bc..7b339c43 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -33,8 +33,8 @@ strata:
morph: strata/input-common.morph
- name: llvm-common
morph: strata/llvm-common.morph
-- name: mesa-common
- morph: strata/mesa-common.morph
+- name: mesa-common-vm
+ morph: strata/mesa-common-vm.morph
- name: x-common
morph: strata/x-common.morph
- name: weston-genivi
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 84f0bad0..6cef12ff 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -31,8 +31,8 @@ strata:
morph: strata/input-common.morph
- name: llvm-common
morph: strata/llvm-common.morph
-- name: mesa-common
- morph: strata/mesa-common.morph
+- name: mesa-common-vm
+ morph: strata/mesa-common-vm.morph
- name: weston-common
morph: strata/weston-common.morph
- name: x-common