12:53 p.m.
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/xwayland
COMMIT: 6ae134c46c8ecf2f98712a2eb95726f2d42a6a30
To run weston with xwayland support you need to launch it like this (in a qemu VM):
'weston-launch -- --backend=fbdev-backend.so --modules=xwayland.so'
(You need to use weston-launch as seems weston has a bug [1] that we are investigating
upstream)
Note the last patch is not to meant to be merged, only in case you want to try a pure
X application in your weston session to test xwayland its working
Javier Jardón (6):
xserver.morph: build minimal xserver with only the XWayland binary
strata/x-common.morph: clean not needed dependencies
strata/x-generic.morph: clean not needed dependencies
weston.morph: Enable xwayland in weston
Add xserver to weston-system
strata/x-generic.morph: build xterm
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 -
strata/x-common.morph | 77 -----------------
strata/x-generic.morph | 128 +++++------------------------
strata/x-generic/xserver.morph | 10 ++-
systems/weston-system-x86_64-generic.morph | 4 +
6 files changed, 36 insertions(+), 186 deletions(-)
--
2.1.3
[1] https://bugs.freedesktop.org/show_bug.cgi?id=87322
12:53 p.m.
New subject: [PATCH 1/6] xserver.morph: build minimal xserver with only the XWayland binary
---
strata/x-generic.morph | 6 ++++++
strata/x-generic/xserver.morph | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 84f685b..d9e7b51 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 f849505..ca67833 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -2,4 +2,12 @@ name: xserver
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1 --disable-glx
+- |
+ ./autogen.sh --prefix="$PREFIX" \
+ --disable-glx \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xnest \
+ --disable-xquartz \
+ --disable-xwin \
+ --enable-xwayland
--
2.1.3
12:53 p.m.
New subject: [PATCH 2/6] strata/x-common.morph: clean not needed dependencies
---
strata/x-common.morph | 77 ---------------------------------------------------
1 file changed, 77 deletions(-)
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 8c0bba1..8191b30 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -98,21 +98,11 @@ chunks:
ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
unpetrify-ref: baserock/morph
build-depends: []
-- name: xorg-proto-xf86dgaproto
- repo: upstream:xorg-proto-xf86dgaproto
- ref: c52b205c3175309be7952774668c87dd2d5ce30e
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xorg-proto-xf86driproto
repo: upstream:xorg-proto-xf86driproto
ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
unpetrify-ref: baserock/morph
build-depends: []
-- name: xorg-proto-xf86vidmodeproto
- repo: upstream:xorg-proto-xf86vidmodeproto
- ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xorg-proto-x11proto
repo: upstream:xorg-proto-x11proto
ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
@@ -165,13 +155,10 @@ chunks:
unpetrify-ref: libX11-1.6.2
build-depends:
- xcb-libxcb
- - xorg-lib-libXau
- xorg-lib-libxtrans
- - xorg-proto-bigreqsproto
- xorg-proto-inputproto
- xorg-proto-kbproto
- xorg-proto-x11proto
- - xorg-proto-xcmiscproto
- xorg-proto-xextproto
- xorg-proto-xf86bigfontproto
- name: xorg-lib-libXext
@@ -193,12 +180,6 @@ chunks:
- xorg-proto-inputproto
- xorg-proto-x11proto
- xorg-proto-xextproto
-- name: xorg-util-makedepend
- repo: upstream:xorg-util-makedepend
- ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-x11proto
- name: xorg-lib-libXfixes
repo: upstream:xorg-lib-libXfixes
ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
@@ -206,14 +187,6 @@ chunks:
build-depends:
- xorg-lib-libXext
- xorg-proto-fixesproto
-- name: xorg-lib-libXcomposite
- repo: upstream:xorg-lib-libXcomposite
- ref: eda48b1bedaa344ada8e13930c9ab3058b836190
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXfixes
- - xorg-proto-compositeproto
- name: xorg-lib-libXrender
repo: upstream:xorg-lib-libXrender
ref: 1af52cb334377611233d7dc156bc1e6f7923756d
@@ -232,24 +205,6 @@ chunks:
- xorg-proto-randrproto
- xorg-proto-renderproto
- xorg-proto-xextproto
-- name: xorg-lib-libXinerama
- repo: upstream:xorg-lib-libXinerama
- ref: 470b9356af961ff7d3968b164aa73872b49a5dcc
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-xextproto
- - xorg-proto-xineramaproto
-- name: xorg-lib-libdmx
- repo: upstream:xorg-lib-libdmx
- ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-dmxproto
- - xorg-proto-xextproto
- name: xorg-lib-libXtst
repo: upstream:xorg-lib-libXtst
ref: 2aafac9474a0a0a0c39797862f823255918cf368
@@ -261,15 +216,6 @@ chunks:
- xorg-proto-inputproto
- xorg-proto-recordproto
- xorg-proto-xextproto
-- name: xorg-lib-libXRes
- repo: upstream:xorg-lib-libXRes
- ref: 83e7693515369d57dcd11c2bb1f03563f51bc500
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-resourceproto
- - xorg-proto-xextproto
- name: xorg-lib-libXdamage
repo: upstream:xorg-lib-libXdamage
ref: 0d35761dc39409b70e04dd0786aef6537f92976a
@@ -287,26 +233,3 @@ chunks:
- xorg-proto-fixesproto
- xorg-lib-libXau
- xorg-lib-libX11
-- name: xorg-proto-printproto
- repo: upstream:xorg-proto-printproto
- ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXp
- repo: upstream:xorg-lib-libXp
- ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-printproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
-- name: xorg-lib-libXScrnSaver
- repo: upstream:xorg-lib-libXScrnSaver
- ref: f388a2ff259ee1c1c6058762e900bb29550e8246
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-scrnsaverproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
--
2.1.3
12:53 p.m.
New subject: [PATCH 3/6] strata/x-generic.morph: clean not needed dependencies
---
strata/x-generic.morph | 136 +------------------------------------------------
1 file changed, 1 insertion(+), 135 deletions(-)
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index d9e7b51..572932b 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -34,153 +34,19 @@ chunks:
unpetrify-ref: libXfont-1.5.0
build-depends:
- xorg-lib-libfontenc
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xserver
morph: strata/x-generic/xserver.morph
repo: upstream:xserver
ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
unpetrify-ref: xorg-server-1.16.2
build-depends:
- - libsha1
+ - libepoxy
- xorg-font-util
- - xorg-lib-libXaw
- xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
- name: xorg-app-xkbcomp
repo: upstream:xorg-app-xkbcomp
ref: 705b9bbb426410f9510601c7010da51184919b36
unpetrify-ref: baserock/morph
build-depends:
- xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
- unpetrify-ref: libXft-2.3.2
- build-depends: []
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- morph: strata/x-generic/util-keysyms.morph
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
--
2.1.3
12:53 p.m.
New subject: [PATCH 4/6] weston.morph: Enable xwayland in weston
---
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index b187df8..9fc05b7 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 2efd662..c49b8d5 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
--
2.1.3
12:53 p.m.
New subject: [PATCH 5/6] Add xserver to weston-system
---
systems/weston-system-x86_64-generic.morph | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/systems/weston-system-x86_64-generic.morph
b/systems/weston-system-x86_64-generic.morph
index 491a34b..b84eaeb 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
--
2.1.3
12:53 p.m.
New subject: [PATCH 6/6] strata/x-generic.morph: build xterm
---
strata/x-generic.morph | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 572932b..b644004 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -50,3 +50,47 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- xorg-lib-libxkbfile
+- name: xorg-lib-libICE
+ repo: upstream:xorg-lib-libICE
+ ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-lib-libSM
+ repo: upstream:xorg-lib-libSM
+ ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libICE
+- name: xorg-lib-libXt
+ repo: upstream:xorg-lib-libXt
+ ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libSM
+- name: xorg-lib-libXmu
+ repo: upstream:xorg-lib-libXmu
+ ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXpm
+ repo: upstream:xorg-lib-libXpm
+ ref: 81608285e11f2455800001a965dfece878861162
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXaw
+ repo: upstream:xorg-lib-libXaw
+ ref: a5630e166921b5b5322b30fb152df01bb6536e42
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXmu
+ - xorg-lib-libXpm
+ - xorg-lib-libXt
+- name: xterm
+ repo: upstream:xterm
+ ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXaw
+ - xorg-lib-libxkbfile
--
2.1.3
7:25 a.m.
On 19 December 2014 at 17:53, Javier Jardón <jjardon(a)gnome.org> wrote:
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/xwayland
COMMIT: 6ae134c46c8ecf2f98712a2eb95726f2d42a6a30
To run weston with xwayland support you need to launch it like this (in a qemu VM):
'weston-launch -- --backend=fbdev-backend.so --modules=xwayland.so'
(You need to use weston-launch as seems weston has a bug [1] that we are investigating
upstream)
Note the last patch is not to meant to be merged, only in case you want to try a pure
X application in your weston session to test xwayland its working
Javier Jardón (6):
xserver.morph: build minimal xserver with only the XWayland binary
strata/x-common.morph: clean not needed dependencies
strata/x-generic.morph: clean not needed dependencies
weston.morph: Enable xwayland in weston
Add xserver to weston-system
strata/x-generic.morph: build xterm
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 -
strata/x-common.morph | 77 -----------------
strata/x-generic.morph | 128 +++++------------------------
strata/x-generic/xserver.morph | 10 ++-
systems/weston-system-x86_64-generic.morph | 4 +
6 files changed, 36 insertions(+), 186 deletions(-)
--
2.1.3
[1] https://bugs.freedesktop.org/show_bug.cgi?id=87322
Hi!
Any chance someone can take a look at this?
The GNOME stratum will need xwayland support
Regards,
--
Javier Jardón Cabezas
8:51 a.m.
New subject: [PATCH 0/6] Add xwayland support to the xserver and the weston session
Hi Javier
Sorry for the delay looking at this!
It seems that this does more than 'add xwayland support to the xserver'
-- it actually disables the main xorg XServer as well, so that X can
only be run inside Wayland now, not on its own.
that may well be what we want -- is there any Baserock reference system
or downstream consumer of Baserock that needs X still? -- but we should
be clear about what's going to happen if this patch is merged.
Sam
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
1:21 p.m.
On 7 January 2015 at 13:51, Sam Thursfield
<sam.thursfield(a)codethink.co.uk> wrote:
Hi Javier
Hey Sam
Sorry for the delay looking at this!
No problem at all!
It seems that this does more than 'add xwayland support to the
xserver' --
it actually disables the main xorg XServer as well, so that X can only be
run inside Wayland now, not on its own.
that may well be what we want -- is there any Baserock reference system or
downstream consumer of Baserock that needs X still? -- but we should be
clear about what's going to happen if this patch is merged.
Yeah, sorry about that. Certainly the title should be more descriptive.
As far as I know, no reference system uses X at all, thats why I tried
to enable the xwayland support with adding as less dependencies as
possible.
I also remember to ask in the IRC and I think thats the feedback I get
there (only xwayland support, not the complete xserver)
I think thats the way to go, as even some distros are thinking on
enabling wayland by default soon.
Saying that, if we still want to keep a full xserver, we can ignore
patches 2 and 3, ans simply enable xwayland in patch 1.
Regards,
--
Javier Jardón Cabezas
4:44 a.m.
New subject: [PATCH 0/6] Add xwayland support to the xserver and the weston session
On 07/01/15 18:21, Javier Jardón wrote:
On 7 January 2015 at 13:51, Sam Thursfield
<sam.thursfield(a)codethink.co.uk> wrote:
> Hi Javier
Hey Sam
> Sorry for the delay looking at this!
No problem at all!
> It seems that this does more than 'add xwayland support to the xserver' --
> it actually disables the main xorg XServer as well, so that X can only be
> run inside Wayland now, not on its own.
>
> that may well be what we want -- is there any Baserock reference system or
> downstream consumer of Baserock that needs X still? -- but we should be
> clear about what's going to happen if this patch is merged.
Yeah, sorry about that. Certainly the title should be more descriptive.
As far as I know, no reference system uses X at all, thats why I tried
to enable the xwayland support with adding as less dependencies as
possible.
I also remember to ask in the IRC and I think thats the feedback I get
there (only xwayland support, not the complete xserver)
I think thats the way to go, as even some distros are thinking on
enabling wayland by default soon.
Saying that, if we still want to keep a full xserver, we can ignore
patches 2 and 3, ans simply enable xwayland in patch 1.
OK, thanks for the explanation. Although we don't use X11 in our
reference systems, it may be that a downstream consumer of Baserock
wants to use X11 without Wayland, and we could make things a bit easier
for them by doing this as two separate patch series: "Add xwayland
support" and "Remove support for all X servers other than Xwayland".
That way, if someone *does* want Baserock in X, they can revert "Remove
support for all X servers other than Xwayland", and it won't break all
the reference systems that need Xwayland.
So, +1 with the above caveat ... the "Add support for Xwayland" patch is
so simple that I'd be happy for this to be done at merge time, no need
to send it for review.
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
10:10 a.m.
New subject: [PATCH 0/6] Add xwayland support to the xserver and the weston session
On Thu, Jan 08, 2015 at 09:44:30AM +0000, Sam Thursfield wrote:
OK, thanks for the explanation. Although we don't use X11 in our
reference systems, it may be that a downstream consumer of Baserock
wants to use X11 without Wayland, and we could make things a bit
easier for them by doing this as two separate patch series: "Add
xwayland support" and "Remove support for all X servers other than
Xwayland". That way, if someone *does* want Baserock in X, they can
revert "Remove support for all X servers other than Xwayland", and
it won't break all the reference systems that need Xwayland.
So, +1 with the above caveat ... the "Add support for Xwayland"
patch is so simple that I'd be happy for this to be done at merge
time, no need to send it for review.
I agree with Sam here, +1 from me too.
12:02 p.m.
New subject: [PATCH 0/3] [V2] Add XWayland support
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/xwayland
To run weston with xwayland support you need to launch it like this (in a qemu VM):
'weston-launch -- --backend=fbdev-backend.so --modules=xwayland.so'
(You need to use weston-launch as seems weston has a bug [1] that we are investigating
upstream)
Javier Jardón (3):
xserver.morph: Enable XWayland support
weston.morph: Enable xwayland in weston
Add xserver to weston-system
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 --
strata/x-generic.morph | 6 ++++++
strata/x-generic/xserver.morph | 5 ++++-
systems/weston-system-x86_64-generic.morph | 4 ++++
5 files changed, 15 insertions(+), 3 deletions(-)
--
2.2.2
12:02 p.m.
New subject: [PATCH 1/3] xserver.morph: Enable XWayland support
---
strata/x-generic.morph | 6 ++++++
strata/x-generic/xserver.morph | 5 ++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 84f685b..d9e7b51 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 f849505..bf0ac3b 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
--
2.2.2
12:02 p.m.
New subject: [PATCH 2/3] weston.morph: Enable xwayland in weston
---
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index b187df8..9fc05b7 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 2efd662..c49b8d5 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
--
2.2.2
12:02 p.m.
New subject: [PATCH 3/3] Add xserver to weston-system
---
systems/weston-system-x86_64-generic.morph | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/systems/weston-system-x86_64-generic.morph
b/systems/weston-system-x86_64-generic.morph
index 491a34b..b84eaeb 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
--
2.2.2
4:47 a.m.
New subject: [PATCH 0/3] [V2] Add XWayland support
On 29/01/15 17:02, Javier Jardón wrote:
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/xwayland
To run weston with xwayland support you need to launch it like this (in a qemu VM):
'weston-launch -- --backend=fbdev-backend.so --modules=xwayland.so'
(You need to use weston-launch as seems weston has a bug [1] that we are investigating
upstream)
Javier Jardón (3):
xserver.morph: Enable XWayland support
weston.morph: Enable xwayland in weston
Add xserver to weston-system
strata/graphics-common.morph | 1 +
strata/weston-common/weston.morph | 2 --
strata/x-generic.morph | 6 ++++++
strata/x-generic/xserver.morph | 5 ++++-
systems/weston-system-x86_64-generic.morph | 4 ++++
5 files changed, 15 insertions(+), 3 deletions(-)
thanks for splitting these up. +1
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
6:52 a.m.
New subject: [PATCH 0/3] [V2] Add XWayland support
On 30 January 2015 at 09:47, Sam Thursfield
<sam.thursfield(a)codethink.co.uk> wrote:
On 29/01/15 17:02, Javier Jardón wrote:
>
> REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
> BRANCH: baserock/jjardon/xwayland
>
> To run weston with xwayland support you need to launch it like this (in a
> qemu VM):
>
> 'weston-launch -- --backend=fbdev-backend.so --modules=xwayland.so'
>
> (You need to use weston-launch as seems weston has a bug [1] that we are
> investigating upstream)
>
> Javier Jardón (3):
> xserver.morph: Enable XWayland support
> weston.morph: Enable xwayland in weston
> Add xserver to weston-system
>
> strata/graphics-common.morph | 1 +
> strata/weston-common/weston.morph | 2 --
> strata/x-generic.morph | 6 ++++++
> strata/x-generic/xserver.morph | 5 ++++-
> systems/weston-system-x86_64-generic.morph | 4 ++++
> 5 files changed, 15 insertions(+), 3 deletions(-)
>
thanks for splitting these up. +1
Ive just merged this (forgot I already had the +1 from Richard from
the previews review)
Thanks!
--
Javier Jardón Cabezas
12:14 p.m.
New subject: [PATCH 0/3] Remove support for all X servers other than Xwayland
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/only_xwayland
This series are meant to be on top of the "Add XWayland support" ones
Javier Jardón (3):
xserver.morph: build minimal xserver with only the XWayland binary
strata/x-common.morph: clean not needed dependencies
strata/x-generic.morph: clean not needed dependencies
strata/x-common.morph | 77 -----------------------
strata/x-generic.morph | 136 +----------------------------------------
strata/x-generic/xserver.morph | 5 ++
3 files changed, 6 insertions(+), 212 deletions(-)
--
2.2.2
12:14 p.m.
New subject: [PATCH 1/3] xserver.morph: build minimal xserver with only the XWayland binary
---
strata/x-generic/xserver.morph | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index bf0ac3b..ca67833 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -5,4 +5,9 @@ configure-commands:
- |
./autogen.sh --prefix="$PREFIX" \
--disable-glx \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xnest \
+ --disable-xquartz \
+ --disable-xwin \
--enable-xwayland
--
2.2.2
12:14 p.m.
New subject: [PATCH 2/3] strata/x-common.morph: clean not needed dependencies
---
strata/x-common.morph | 77 ---------------------------------------------------
1 file changed, 77 deletions(-)
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 8c0bba1..8191b30 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -98,21 +98,11 @@ chunks:
ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0
unpetrify-ref: baserock/morph
build-depends: []
-- name: xorg-proto-xf86dgaproto
- repo: upstream:xorg-proto-xf86dgaproto
- ref: c52b205c3175309be7952774668c87dd2d5ce30e
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xorg-proto-xf86driproto
repo: upstream:xorg-proto-xf86driproto
ref: cb03b8d49bf063860859c1ed8bcecd055551e93a
unpetrify-ref: baserock/morph
build-depends: []
-- name: xorg-proto-xf86vidmodeproto
- repo: upstream:xorg-proto-xf86vidmodeproto
- ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xorg-proto-x11proto
repo: upstream:xorg-proto-x11proto
ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155
@@ -165,13 +155,10 @@ chunks:
unpetrify-ref: libX11-1.6.2
build-depends:
- xcb-libxcb
- - xorg-lib-libXau
- xorg-lib-libxtrans
- - xorg-proto-bigreqsproto
- xorg-proto-inputproto
- xorg-proto-kbproto
- xorg-proto-x11proto
- - xorg-proto-xcmiscproto
- xorg-proto-xextproto
- xorg-proto-xf86bigfontproto
- name: xorg-lib-libXext
@@ -193,12 +180,6 @@ chunks:
- xorg-proto-inputproto
- xorg-proto-x11proto
- xorg-proto-xextproto
-- name: xorg-util-makedepend
- repo: upstream:xorg-util-makedepend
- ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-x11proto
- name: xorg-lib-libXfixes
repo: upstream:xorg-lib-libXfixes
ref: 0cb446962381f750e05d97bfb974ca1e32481d5d
@@ -206,14 +187,6 @@ chunks:
build-depends:
- xorg-lib-libXext
- xorg-proto-fixesproto
-- name: xorg-lib-libXcomposite
- repo: upstream:xorg-lib-libXcomposite
- ref: eda48b1bedaa344ada8e13930c9ab3058b836190
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXfixes
- - xorg-proto-compositeproto
- name: xorg-lib-libXrender
repo: upstream:xorg-lib-libXrender
ref: 1af52cb334377611233d7dc156bc1e6f7923756d
@@ -232,24 +205,6 @@ chunks:
- xorg-proto-randrproto
- xorg-proto-renderproto
- xorg-proto-xextproto
-- name: xorg-lib-libXinerama
- repo: upstream:xorg-lib-libXinerama
- ref: 470b9356af961ff7d3968b164aa73872b49a5dcc
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-xextproto
- - xorg-proto-xineramaproto
-- name: xorg-lib-libdmx
- repo: upstream:xorg-lib-libdmx
- ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-dmxproto
- - xorg-proto-xextproto
- name: xorg-lib-libXtst
repo: upstream:xorg-lib-libXtst
ref: 2aafac9474a0a0a0c39797862f823255918cf368
@@ -261,15 +216,6 @@ chunks:
- xorg-proto-inputproto
- xorg-proto-recordproto
- xorg-proto-xextproto
-- name: xorg-lib-libXRes
- repo: upstream:xorg-lib-libXRes
- ref: 83e7693515369d57dcd11c2bb1f03563f51bc500
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libX11
- - xorg-lib-libXext
- - xorg-proto-resourceproto
- - xorg-proto-xextproto
- name: xorg-lib-libXdamage
repo: upstream:xorg-lib-libXdamage
ref: 0d35761dc39409b70e04dd0786aef6537f92976a
@@ -287,26 +233,3 @@ chunks:
- xorg-proto-fixesproto
- xorg-lib-libXau
- xorg-lib-libX11
-- name: xorg-proto-printproto
- repo: upstream:xorg-proto-printproto
- ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXp
- repo: upstream:xorg-lib-libXp
- ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-printproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
-- name: xorg-lib-libXScrnSaver
- repo: upstream:xorg-lib-libXScrnSaver
- ref: f388a2ff259ee1c1c6058762e900bb29550e8246
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-proto-scrnsaverproto
- - xorg-proto-xextproto
- - xorg-lib-libXext
- - xorg-lib-libX11
--
2.2.2
12:14 p.m.
New subject: [PATCH 3/3] strata/x-generic.morph: clean not needed dependencies
---
strata/x-generic.morph | 136 +------------------------------------------------
1 file changed, 1 insertion(+), 135 deletions(-)
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index d9e7b51..572932b 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -34,153 +34,19 @@ chunks:
unpetrify-ref: libXfont-1.5.0
build-depends:
- xorg-lib-libfontenc
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
- name: xserver
morph: strata/x-generic/xserver.morph
repo: upstream:xserver
ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d
unpetrify-ref: xorg-server-1.16.2
build-depends:
- - libsha1
+ - libepoxy
- xorg-font-util
- - xorg-lib-libXaw
- xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
- name: xorg-app-xkbcomp
repo: upstream:xorg-app-xkbcomp
ref: 705b9bbb426410f9510601c7010da51184919b36
unpetrify-ref: baserock/morph
build-depends:
- xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738
- unpetrify-ref: libXft-2.3.2
- build-depends: []
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- morph: strata/x-generic/util-keysyms.morph
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
--
2.2.2
4:47 a.m.
New subject: [PATCH 0/3] Remove support for all X servers other than Xwayland
On 29/01/15 17:14, Javier Jardón wrote:
REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
BRANCH: baserock/jjardon/only_xwayland
This series are meant to be on top of the "Add XWayland support" ones
Javier Jardón (3):
xserver.morph: build minimal xserver with only the XWayland binary
strata/x-common.morph: clean not needed dependencies
strata/x-generic.morph: clean not needed dependencies
strata/x-common.morph | 77 -----------------------
strata/x-generic.morph | 136 +----------------------------------------
strata/x-generic/xserver.morph | 5 ++
3 files changed, 6 insertions(+), 212 deletions(-)
thanks for splitting these up. +1
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
6:53 a.m.
New subject: [PATCH 0/3] Remove support for all X servers other than Xwayland
On 30 January 2015 at 09:47, Sam Thursfield
<sam.thursfield(a)codethink.co.uk> wrote:
On 29/01/15 17:14, Javier Jardón wrote:
>
> REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git
> BRANCH: baserock/jjardon/only_xwayland
>
> This series are meant to be on top of the "Add XWayland support" ones
>
> Javier Jardón (3):
> xserver.morph: build minimal xserver with only the XWayland binary
> strata/x-common.morph: clean not needed dependencies
> strata/x-generic.morph: clean not needed dependencies
>
> strata/x-common.morph | 77 -----------------------
> strata/x-generic.morph | 136
> +----------------------------------------
> strata/x-generic/xserver.morph | 5 ++
> 3 files changed, 6 insertions(+), 212 deletions(-)
>
thanks for splitting these up. +1
Ive just merged this (forgot I already had the +1 from Richard from
the previews review)
Thanks!
--
Javier Jardón Cabezas
2706
days inactive
2752
days old
23 comments
3 participants
participants (3)
-
Javier Jardón -
Richard Maw -
Sam Thursfield