Commit Graph

63 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult c8b81fdbc5 drop Xwayland
It always had it's own lifecycle (not been part of Xorg releases),
doesn't make sense to maintain a competing implementation that we
won't use anyways.

Once that's gone, we can also drop few things in core/dix that had
been added just for xwayland only.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-06-17 12:51:36 +02:00
Enrico Weigelt, metux IT consult 6b813d16a2 ci: update libdrm to 2.4.121
Needed for newer version of amdgpu driver.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2025-06-12 17:21:46 +02:00
Michel Dänzer f73f8ccb60 ci: Install XCB dependencies for meson tests
The lack of these prevented some of the tests from running in CI.
2025-02-26 09:57:07 +01:00
Alan Coopersmith 9af363b046 ci: update XTS to a commit that doesn't require -fcommon workaround
xorg/test/xts!10 fixed XTS to build with recent gcc without adding -fcommon

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1786>
2025-02-17 19:16:04 +00:00
Enrico Weigelt, metux IT consult 5f1bdd0aa3 ci: add intel driver to build matrix
Add the intel driver to our CI, in order to prevent API breaks going
unnoticed again.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1778>
2025-02-11 09:53:59 +01:00
Olivier Fourdan a55ed3309b ci: Install wayland-protocols 1.38
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1742>
2024-12-02 08:55:34 +00:00
Olivier Fourdan d98b36461a ci: Check for DDXen to be built
Add a script in CI to check for the mere presence of the expected DDXen
to be built.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1743>
2024-11-19 09:19:15 +01:00
Alan Coopersmith 3de2e27ccc CI: update meson from 0.56.2 (bullseye) to 1.0.0 (bullseye-backports)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
2024-09-09 07:47:32 -07:00
Alan Coopersmith 32adf434b7 CI: update libdecor from 0.1.0 to 0.1.1
The install_demo meson_option was added in
libdecor/libdecor@7106f5e329
which is in the 0.1.1 tag, but not 0.1.0.

If we upgrade the version of meson used in the CI to 1.0.0, then it fails
to build libdecor 0.1.0 with: ERROR: Unknown options: "install_demo"

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
2024-09-09 07:44:44 -07:00
Alan Coopersmith fc8ba24413 CI: clone libdecor from fd.o instead of gnome.org
https://gitlab.gnome.org/jadahl/libdecor is archived and the README
says to use  https://gitlab.freedesktop.org/libdecor/libdecor instead.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
2024-09-09 07:44:44 -07:00
Alan Coopersmith 83f553b340 CI: Update xcb util libraries to versions with working submodule URLs
The tags previously listed used anongit.fd.o URLs for their submodules
which no longer work.  Update to tags using gitlab.fd.o URL's instead.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1672>
2024-09-09 00:08:52 +00:00
Enrico Weigelt, metux IT consult 9929f64ec8 ci: fix w64 cross build pkg-config path
pkg-config path is wrong: it's using /usr/share/pkgconfig from the *host*
instead of sysroot, which is leading to wrong pathes.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1655>
2024-08-23 15:42:21 +02:00
Erik Kurzinger e00e7205c9 Update CI for Xwayland explicit sync
Explicit sync support for Xwayland requires several updates to the
Debian CI image. These include...

xorgproto 2024.1 for DRI3 1.4 and Present 1.4
wayland-protocols 1.34 for wp-linux-drm-syncobj-v1
libdrm 2.4.116 for drmSyncobjEventfd
linux-libc-dev from bullseye-backports for DMA_BUF_IOCTL_IMPORT/EXPORT_SYNC_FD

Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/967>
2024-04-09 06:11:03 +00:00
Peter Hutterer 89b7f45010 CI: add a driver build stage to check for header breakage
Pull a few drivers and try to build their most recent release (or a
specific SHA) and see if they still build. If they do, yay, otherwise
fail.

Dependency-wise we need to keep libevdev-dev and libinput-dev around
now and add libspice-protocol-dev for the qxl driver.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1318>
2024-03-19 00:37:35 +00:00
Enrico Weigelt, metux IT consult 53a0442b87 drop remains of DMX
DMX has long gone, but there's still some fallout from it's removal
yet to be cleaned up.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1362>
2024-03-05 16:57:52 +01:00
Peter Hutterer 96b9bbe9fa CI: replace the dist script with invocations of the meson-build script
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
2024-02-29 01:27:02 +00:00
Peter Hutterer ce2f24c510 CI: switch to the meson-build.sh helper script
This script does the same thing but has a few more toggles than our
custom script which means we can set everything we need in the
gitlab-ci.yml file and have it DTRT.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
2024-02-29 01:27:02 +00:00
Peter Hutterer 0ab32a7587 CI: use MESON_BUILDDIR for the build directory
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1317>
2024-02-29 01:27:02 +00:00
Peter Hutterer a133334270 xwayland: Add XTEST support using EIS
This adds support for XTEST in Xwayland using EIS, the emulated input
library [1].

To differentiate between X11 clients using XTEST, initiate a EI context
for each client and use the actual client name, from its command
line.

When an X11 client first tries to use XTEST to generate emulated input
events, a new connection to libEI is initiated by Xwayland on behalf
of the X11 client.

During that connection phase, the EI server will not be accepting
events until the emulated device is actually created, meaning that any
XTEST request from the X11 client will be discarded until the EI server
is willing to accept events.

To avoid that issue, add an event queue in Xwayland per X11 client that
will keep those requests, and dequeue them as soon as the EI server is
ready, i.e. once the EI device is added.

If the X11 client disconnects from the Xserver before the EI server is
ready, or if the connection is closed by the EI server, those events are
discarded and the queue cleared from any pending events.

For 10 minutes after the client disconnects, keep the internal struct
alive. If a client with the same commandline arguments connects again,
re-use the same struct. This means we are faster with the events the
second time around but it also allows the EIS server to pause individual
clients that keep sending intermittent events and disconnect immediately
(e.g. it'd be possible to pause xdtotool while an authentication prompt
is active).

[1] https://gitlab.freedesktop.org/libinput/libei

Thanks to Jan Beich <jbeich@FreeBSD.org> for fixing the build on BSD.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Co-authored-by: Olivier Fourdan <ofourdan@redhat.com>
Co-authored-by: David Redondo <kde@david-redondo.de>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2023-06-26 13:19:19 +02:00
Xaver Hugl c6bf0e3950 Update CI to xorgproto 2023.2
This is needed to support tearing-updates-v1

Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2023-06-19 12:19:28 +02:00
Xaver Hugl e3480b0d78 Update the CI to provide wayland-protocols 1.30
This is needed for tearing-updates-v1

Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2023-06-19 12:19:18 +02:00
Austin Shafer 5a742ab876 Add libdrm 2.4.109 requirement
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2023-03-03 14:18:49 +00:00
Michel Dänzer 5c18e25e12 ci: Export LP_NUM_THREADS=0 for meson test
This prevents the Mesa llvmpipe driver from spawning (potentially lots
of) worker threads.

Suggested by Daniel Stone on IRC.
2023-01-19 15:11:17 +01:00
Michel Dänzer 81d91f7d01 ci: Move dist testing to a separate job
Multiple reasons, in particular:

* Doing it in every build & test job duplicates effort, resulting in
  the pipeline taking longer than necessary.
* We cannot limit the number of test processes spawned by meson dist.
* There's little point running tests for dist anyway, we just want to
  make sure we can build & install from the generated tarball.
2023-01-19 15:08:57 +01:00
Michel Dänzer b2dee689fa ci: Use "meson test" instead of "ninja test"
This lets us actually limit the number of test processes spawned in
parallel.

(ninja test runs meson test without --num-processes, so it ends up
spawning as many processes in parallel as there are CPU cores)
2023-01-19 15:07:57 +01:00
Joshua Ashton d1fbee9cf5 ci: Bump to wayland-protocols 1.28 for xwayland_shell
Debian Bullseye only has 1.20, so we need to bump this.

Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2022-12-21 11:03:20 +00:00
Joshua Ashton 7c5bb5e9c5 ci: Bump to wayland 1.21.0
wayland-protocols requires wayland-scanner 1.20, but Debian bullseye has 1.18 only

Signed-off-by: Joshua Ashton <joshua@froggi.es>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2022-12-21 11:03:20 +00:00
Luc Ma 4603d64483 ci: remove redundant slash in libxcvt repository url
Fixes: 84897891e5 ("ci: Install libxcvt from git")
Signed-off-by: Luc Ma <luc@sietium.com>
2022-09-11 11:53:54 +00:00
Michel Dänzer 421e066ec4 ci: Check that all expected piglit results are there
Without these, the build jobs would spuriously pass if some of the
expected piglit tests didn't run at all.

v2:
* Use local variables instead of starting their names with underscores
  (Peter Hutterer)
2022-09-07 18:50:15 +02:00
Michel Dänzer 67bca99637 ci: Move build job script to a separate file
Will make it easier to do more complex shell stuff.

No functional change intended.

v2:
* Use /bin/bash instead of /bin/sh (Peter Hutterer)
* Export environment variables on a separate line (Peter)
* Use "set" command instead of shell command line arguments, for
  consistency with debian-install.sh.
2022-09-02 14:52:20 +02:00
Michel Dänzer 3d7df9b452 ci: Use fixed Git commits for piglit, rendercheck & xts
Without this, building a new docker image may pull in new changes from
those repositories, which may affect the CI results.
2022-09-02 14:52:18 +02:00
Michel Dänzer c637ca66ec ci: Install weston from Debian
The commit below was meant to do this, but it slipped through the
cracks.

Fixes: e2dcf31059 ("CI: Update gitlab CI to use debian bullseye")
2022-09-02 14:50:45 +02:00
Peter Hutterer 2700bc6045 xwayland: add support for the XWAYLAND extension
This extension exists to serve one purpose: reliably identifying
Xwayland. Previous attempts at doing so included querying root window
properties, output names or input device names. All these attempts are
somewhat unreliable. Instead, let's use an extension - where that
extension is present we have an Xwayland server.

Clients should never need to do anything but check whether the extension
exists through XQueryExtension or search through XListExtensions.

This extension provides a single QueryVersion request only, and
that is only to provide future compatibility if we ever need anything
other than "this extension exists" functionality.

https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/54

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2022-08-11 10:30:32 +10:00
Jeremy Huddleston Sequoia e2dcf31059 CI: Update gitlab CI to use debian bullseye
Also install xkbcomp, libwayland-dev, and weston from debian since it is new enough now

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-07-01 21:38:54 +00:00
Jeremy Huddleston Sequoia 3288149096 CI: Use -fcommon to build xtst
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-07-01 21:38:54 +00:00
Jeremy Huddleston Sequoia ecce57c332 CI: Use -fcommon to build libX11 for mingw
See discussions at https://gitlab.freedesktop.org/xorg/lib/libx11/-/merge_requests/140
               and https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-07-01 21:38:54 +00:00
Jeremy Huddleston Sequoia 4fe4f17804 CI: Update to xcb-proto-1.14.1 to support python 3.9
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-07-01 21:38:54 +00:00
Olivier Fourdan 727507eb31 ci: add libdecor
Add libdecor 0.1.0 to CI.

v2: Build with and without libdecor

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
2022-06-30 17:53:01 +02:00
Xaver Hugl fabd6a7c65 Update the CI to provide wayland-protocols 1.22
This is needed for implementing drm-lease-v1

Signed-off-by: Xaver Hugl <xaver.hugl@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
2021-12-07 10:02:29 +00:00
Olivier Fourdan 84897891e5 ci: Install libxcvt from git
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2021-08-06 11:29:29 +00:00
Povilas Kanapickas 2acde60147 .gitlab-ci: Install xorgproto 2021.4.99.2 from git
This is required for the support of upcoming XI 2.4 protocol.

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2021-05-30 13:26:28 +03:00
Jon Turney d3933a24d1 CI: Add an x86 MinGW-w64 cross build
Only cross-build for x86 MinGW-w64, as x64 MinGW-w64 will probably
require fixing LLP64 issues.

I don't know any source for pre-built cross-dependencies of the X
server, so build these from git.

Don't build with GLX enabled, so I don't have to deal with
cross-building mesa and it's dependencies, for the moment.
2021-04-24 19:43:00 +01:00
Michel Dänzer f08ab719df ci: Test ninja dist in meson jobs
While this isn't critical yet, it might become so at some point, so
let's make sure it keeps working.

Don't set the PIGLIT/XTEST_DIR variables for ninja dist, testing XTS
once against each DDX is enough (as part of ninja test).

Requires git in the docker image.

v2:
* Drop /usr/local/bin/xkbcomp symlink, no longer needed with xkbcomp
  1.4.1 (Peter Hutterer)
2021-01-22 17:03:16 +00:00
Michel Dänzer 099eb6261c ci: Build xkbcomp 1.4.1 for the docker image
This is a requirement for testing meson dist in CI.
2021-01-22 17:03:16 +00:00
Michel Dänzer 250db8708a xwayland: Add and hook up test script
It runs XTS via piglit on (non-rootless) Xwayland on weston using the
headless backend.

Xwayland might use glamor if enabled in the build, but we're making sure
it uses software rendering.

v2:
* Use weston-info to wait for weston to be ready, instead of just a
  fixed sleep. (Martin Peres)
v3:
* Build wayland 1.18 & weston 9.0 locally, since the packages in Debian
  buster are too old for current Xwayland.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-17 18:21:37 +01:00
Michel Dänzer 821399a9c9 ci: Base docker image on Debian buster instead of testing
By its nature, testing incurs a risk of breaking something every time
we bump the image.

This requires building wayland-protocols locally, since the package in
buster is too old for current Xwayland.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-17 18:20:52 +01:00
Michel Dänzer 852d6d4910 ci: Explicitly list packages needed to build xserver
Instead of relying on apt-get build-dep.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-17 18:19:17 +01:00
Michel Dänzer 8469935fe2 ci: Use a variable for ephemeral packages
So that they only need to be listed once.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-17 18:18:20 +01:00
Michel Dänzer 996ba1b99a ci: Remove rendercheck Git tree
Noticed this was missing while making changes in this area.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-17 18:18:05 +01:00
Michel Dänzer 9a7515943f ci: Use $FDO_CI_CONCURRENT if set
To take advantage of more than 4 CPU cores available to the container.

Acked-by: Olivier Fourdan <ofourdan@redhat.com>
2020-11-12 18:35:45 +01:00