summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-03 10:18:45 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-03 10:19:27 +0000
commitb95bcaf8589717728a5b32227c55941334b1d46a (patch)
tree5fba6132a242e8dcd77f2a028739eba819173135
parentabef72d698a0ed48580cbedef5d8e1be058f906f (diff)
parente37a3e0133c7ab8f55c0438f6e8264ba1294072f (diff)
downloaddefinitions-b95bcaf8589717728a5b32227c55941334b1d46a.tar.gz
Merge branch 'baserock/jjardon/xwayland'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Richard Maw <richard.maw@codethink.co.uk>
-rw-r--r--strata/graphics-common.morph1
-rw-r--r--strata/weston-common/weston.morph2
-rw-r--r--strata/x-generic.morph6
-rw-r--r--strata/x-generic/xserver.morph5
-rw-r--r--systems/weston-system-x86_64-generic.morph4
5 files changed, 15 insertions, 3 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index b187df8f..9fc05b7c 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -2,6 +2,7 @@ name: graphics-common
kind: stratum
build-depends:
- morph: strata/mesa-common.morph
+- morph: strata/x-common.morph
chunks:
- name: pixman
repo: upstream:pixman
diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph
index 2efd662e..c49b8d5b 100644
--- a/strata/weston-common/weston.morph
+++ b/strata/weston-common/weston.morph
@@ -4,6 +4,4 @@ build-system: autotools
configure-commands:
- |
./autogen.sh --prefix="$PREFIX" \
- --disable-xwayland \
- --disable-x11-compositor \
--enable-demo-clients-install
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 84f685b0..d9e7b516 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -3,9 +3,15 @@ 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:
+- name: libepoxy
+ repo: upstream:libepoxy
+ ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+ unpetrify-ref: v1.2
+ build-depends: []
- name: xorg-lib-libxkbfile
repo: upstream:xorg-lib-libxkbfile
ref: 7381c2f9013ef7784c78091fa671e652a62ca706
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index f8495057..bf0ac3b3 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -2,4 +2,7 @@ name: xserver
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1 --disable-glx
+- |
+ ./autogen.sh --prefix="$PREFIX" \
+ --disable-glx \
+ --enable-xwayland
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 491a34bc..b84eaeb5 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -33,6 +33,10 @@ strata:
morph: strata/mesa-common.morph
- name: weston-common
morph: strata/weston-common.morph
+- name: x-common
+ morph: strata/x-common.morph
+- name: x-generic
+ morph: strata/x-generic.morph
configuration-extensions:
- set-hostname
- add-config-files