CI: install libdisplay-info
DRM-backend will want to use this. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
parent
ff2d2f757c
commit
1605a6a747
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue