diff options
| author | Austin Shafer <ashafer@nvidia.com> | 2022-09-02 11:54:05 -0400 |
|---|---|---|
| committer | Olivier Fourdan <fourdan@gmail.com> | 2023-03-03 14:18:49 +0000 |
| commit | 5a742ab8763d7b041c427f1d725f6bbd7ae82fa1 (patch) | |
| tree | 17d41629930b5843198fb7e65e91c95dccf24f38 | |
| parent | d5dd3f3ceea30034e0bde1d11b460149c9373b93 (diff) | |
| download | xserver-5a742ab8763d7b041c427f1d725f6bbd7ae82fa1.tar.gz | |
Add libdrm 2.4.109 requirement
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 8 | ||||
| -rw-r--r-- | meson.build | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22769a047..b1e725331 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2022-11-24-new-wayland-protocols" + FDO_DISTRIBUTION_TAG: "2023-01-25-libdrm-update" include: - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 5fca4c625..62c292be5 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -113,6 +113,14 @@ apt-get install -y \ cd /root +# Xwayland requires drm 2.4.109 for drmGetDeviceFromDevId +git clone https://gitlab.freedesktop.org/mesa/drm --depth 1 --branch=libdrm-2.4.109 +cd drm +meson _build +ninja -C _build -j${FDO_CI_CONCURRENT:-4} install +cd .. +rm -rf drm + # xserver requires libxcvt git clone https://gitlab.freedesktop.org/xorg/lib/libxcvt.git --depth 1 --branch=libxcvt-0.1.0 cd libxcvt diff --git a/meson.build b/meson.build index 98fcb5992..9657fe8e4 100644 --- a/meson.build +++ b/meson.build @@ -60,7 +60,7 @@ endforeach add_project_arguments(common_wflags, language : ['c', 'objc']) -libdrm_req = '>= 2.4.89' +libdrm_req = '>= 2.4.109' libselinux_req = '>= 2.0.86' xext_req = '>= 1.0.99.4' wayland_req = '>= 1.21.0' |