summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-30 09:07:35 (GMT)
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-30 09:07:35 (GMT)
commit4f6f1df1ddab346af6eda019559149c7d2c4c2b0 (patch)
tree8cf0f87b398b125ac6e7317a3c9d1b16b942fbe2
parent667390f06a5cb4842e6396b6fb06db5e75724880 (diff)
downloaddefinitions-4f6f1df1ddab346af6eda019559149c7d2c4c2b0.tar.gz
Clean up mesa and gstreamer issues in plusplus
-rw-r--r--strata/mesa-common.morph1
-rw-r--r--strata/mesa-common/mesa.morph2
-rw-r--r--systems/genivi-plusplus-system-x86_64-generic.morph2
3 files changed, 3 insertions, 2 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index b5a3ec6..08464ea 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -5,6 +5,7 @@ build-depends:
- morph: strata/wayland-generic.morph
chunks:
- name: mesa
+ morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
ref: baserock/unified
build-depends: []
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 733e1b1..1439ab4 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -14,7 +14,7 @@ configure-commands:
esac
./autogen.sh --prefix="$PREFIX" \
--enable-gles2 \
- --disable-gallium-egl \
+ --enable-gallium-egl \
--with-egl-platforms=x11,drm,wayland \
--enable-gbm \
--enable-shared-glapi \
diff --git a/systems/genivi-plusplus-system-x86_64-generic.morph b/systems/genivi-plusplus-system-x86_64-generic.morph
index 9da8503..561ecb4 100644
--- a/systems/genivi-plusplus-system-x86_64-generic.morph
+++ b/systems/genivi-plusplus-system-x86_64-generic.morph
@@ -19,7 +19,7 @@ strata:
morph: strata/audio-bluetooth.morph
- name: x-common
morph: strata/x-common.morph
-- name: multimedia
+- name: multimedia-gstreamer-0.10
morph: strata/multimedia.morph
- name: genivi
morph: strata/genivi.morph