diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.com> | 2023-04-28 14:18:07 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.com> | 2023-04-28 15:57:46 +0300 |
| commit | 1605a6a747e58c4854196bdd2ebd8d3c1d6a6039 (patch) | |
| tree | e4152a7b217b1a4de46c601e7ab258ade039dc4d | |
| parent | ff2d2f757ca9780d1f0c0b17c41b39f2987b875d (diff) | |
| download | weston-1605a6a747e58c4854196bdd2ebd8d3c1d6a6039.tar.gz | |
CI: install libdisplay-info
DRM-backend will want to use this.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/build-deps.sh | 8 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe43af89..f1dad315 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ variables: FDO_UPSTREAM_REPO: wayland/weston FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" - FDO_DISTRIBUTION_TAG: '2023-04-28-wrapmode-nofallback' + FDO_DISTRIBUTION_TAG: '2023-04-28-add-libdisplay-info.4' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index e6da6039..1d4abe65 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -175,3 +175,11 @@ meson build --wrap-mode=nofallback -Dauto_features=disabled ninja ${NINJAFLAGS} -C build install cd .. rm -rf neatvnc + +# Build and install libdisplay-info, used by drm-backend +git clone --branch 0.1.1 --depth=1 https://gitlab.freedesktop.org/emersion/libdisplay-info.git +cd libdisplay-info +meson build --wrap-mode=nofallback +ninja ${NINJAFLAGS} -C build install +cd .. +rm -rf libdisplay-info diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index e89f6176..75889081 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -1,5 +1,5 @@ #!/bin/bash -# +# # Constructs the base container image used to build Weston within CI. Per the # comment at the top of .gitlab-ci.yml, any changes in this file must bump the # $FDO_DISTRIBUTION_TAG variable so we know the container has to be rebuilt. @@ -43,6 +43,7 @@ apt-get -y --no-install-recommends install \ freerdp2-dev \ gcovr \ git \ + hwdata \ lcov \ libasound2-dev \ libbluetooth-dev \ |