ci: Build Xserver from git
This is to get support for the “-terminate delay” option in Xwayland with libXfixes 6.0. libXfixes 6.0 provides the new ClientDisconnectMode that clients can use to declare themselves as to-be-terminated. This can be used to let Xwayland terminate itself automatically when no other (“non-terminatable”) X11 client is left. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1794>
This commit is contained in:
parent
0dd652e4e4
commit
ffa5fd776d
@ -17,7 +17,7 @@ variables:
|
|||||||
.mutter.fedora:35@common:
|
.mutter.fedora:35@common:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: 35
|
FDO_DISTRIBUTION_VERSION: 35
|
||||||
BASE_TAG: '2022-01-25'
|
BASE_TAG: '2022-01-26.0'
|
||||||
FDO_DISTRIBUTION_PACKAGES:
|
FDO_DISTRIBUTION_PACKAGES:
|
||||||
asciidoc
|
asciidoc
|
||||||
clang
|
clang
|
||||||
@ -30,6 +30,7 @@ variables:
|
|||||||
uncrustify
|
uncrustify
|
||||||
xorg-x11-server-Xvfb
|
xorg-x11-server-Xvfb
|
||||||
mesa-dri-drivers
|
mesa-dri-drivers
|
||||||
|
xorg-x11-proto-devel
|
||||||
|
|
||||||
FDO_DISTRIBUTION_EXEC: |
|
FDO_DISTRIBUTION_EXEC: |
|
||||||
dnf install -y 'dnf-command(builddep)' &&
|
dnf install -y 'dnf-command(builddep)' &&
|
||||||
@ -40,6 +41,26 @@ variables:
|
|||||||
dnf builddep -y libinput --setopt=install_weak_deps=False &&
|
dnf builddep -y libinput --setopt=install_weak_deps=False &&
|
||||||
dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
|
dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
|
||||||
|
|
||||||
|
# For Xwayland
|
||||||
|
dnf builddep -y xorg-x11-server-Xwayland --setopt=install_weak_deps=False &&
|
||||||
|
dnf install -y 'pkgconfig(fontutil)' &&
|
||||||
|
dnf install -y 'pkgconfig(libxcvt)' &&
|
||||||
|
|
||||||
|
./.gitlab-ci/install-meson-project.sh \
|
||||||
|
-Dxwayland=true \
|
||||||
|
-Dxwayland_eglstream=true \
|
||||||
|
-D{xorg,xnest,xvfb}=false \
|
||||||
|
-Dvendor_name="Mutter CI" \
|
||||||
|
-D{xdmcp,udev,udev_kms}=false \
|
||||||
|
-Dxcsecurity=true \
|
||||||
|
-Dglamor=true \
|
||||||
|
-D{dri1,dri2}=false \
|
||||||
|
-Ddri3=true \
|
||||||
|
https://gitlab.freedesktop.org/xorg/xserver.git \
|
||||||
|
xwayland-22.1 \
|
||||||
|
. \
|
||||||
|
xwayland-22.0.99.901 &&
|
||||||
|
|
||||||
./.gitlab-ci/install-meson-project.sh \
|
./.gitlab-ci/install-meson-project.sh \
|
||||||
https://gitlab.gnome.org/GNOME/gjs.git \
|
https://gitlab.gnome.org/GNOME/gjs.git \
|
||||||
master . 5a1237aeb81feddd016fb9f71e77d5ee872bccd0 &&
|
master . 5a1237aeb81feddd016fb9f71e77d5ee872bccd0 &&
|
||||||
|
Loading…
Reference in New Issue
Block a user