Skip to content
Snippets Groups Projects
Commit 1605a6a7 authored by Pekka Paalanen's avatar Pekka Paalanen
Browse files

CI: install libdisplay-info


DRM-backend will want to use this.

Signed-off-by: default avatarPekka Paalanen <pekka.paalanen@collabora.com>
parent ff2d2f75
No related branches found
No related tags found
1 merge request!1229Integrate libdisplay-info (optional at first)
......@@ -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
#!/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 \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment