diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2021-07-09 15:11:51 +0200 |
|---|---|---|
| committer | Povilas Kanapickas <povilas@radix.lt> | 2021-08-06 11:29:29 +0000 |
| commit | 84897891e5e7eb44068cda22284dca70c6cfd1a2 (patch) | |
| tree | f29b4ae99031cc2f9349306ced1fa55092a5948e | |
| parent | 5c2592cbb19f996c4bb87bca4e4e46ab911d4bec (diff) | |
ci: Install libxcvt from git
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 157a53006..d5404c00a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: buster-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2021-05-17" + FDO_DISTRIBUTION_TAG: "2021-07-09" include: - project: 'freedesktop/ci-templates' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 963533cda..16003e8a4 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -107,6 +107,14 @@ apt-get install -y \ cd /root +# xserver requires libxcvt +git clone https://gitlab.freedesktop.org/xorg/lib//libxcvt.git --depth 1 --branch=libxcvt-0.1.0 +cd libxcvt +meson _build +ninja -C _build -j${FDO_CI_CONCURRENT:-4} install +cd .. +rm -rf libxcvt + # xserver requires xorgproto >= 2021.4.99.2 for XI 2.3.99.1 git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.4.99.2 pushd xorgproto |