diff --git a/.gitlab-ci/container/build-weston.sh b/.gitlab-ci/container/build-weston.sh new file mode 100644 index 00000000000..1be03fec745 --- /dev/null +++ b/.gitlab-ci/container/build-weston.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2086 # we want word splitting + +set -uex + +section_start weston "Building Weston" + +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_BASE_TAG + +export WESTON_VERSION="14.0.1" + +git clone https://gitlab.freedesktop.org/wayland/weston +cd weston +git checkout "$WESTON_VERSION" +meson setup \ + -Dbackend-drm=false \ + -Dbackend-drm-screencast-vaapi=false \ + -Dbackend-headless=true \ + -Dbackend-pipewire=false \ + -Dbackend-rdp=false \ + -Dscreenshare=false \ + -Dbackend-vnc=false \ + -Dbackend-wayland=false \ + -Dbackend-x11=false \ + -Dbackend-default=headless \ + -Drenderer-gl=true \ + -Dxwayland=true \ + -Dsystemd=false \ + -Dremoting=false \ + -Dpipewire=false \ + -Dshell-desktop=true \ + -Dshell-fullscreen=false \ + -Dshell-ivi=false \ + -Dshell-kiosk=false \ + -Dcolor-management-lcms=false \ + -Dimage-jpeg=false \ + -Dimage-webp=false \ + -Dtools= \ + -Ddemo-clients=false \ + -Dsimple-clients= \ + -Dresize-pool=false \ + -Dwcap-decode=false \ + -Dtests=false \ + -Ddoc=false \ + _build ${EXTRA_MESON_ARGS:-} +meson install -C _build +cd .. +rm -rf weston + +section_end weston diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh index 9c4e142f0fd..1d2d8b07eef 100644 --- a/.gitlab-ci/container/debian/test-base.sh +++ b/.gitlab-ci/container/debian/test-base.sh @@ -40,6 +40,7 @@ EPHEMERAL=( glslang-tools g++ libasound2-dev + libcairo2-dev libcap-dev "libclang-cpp${LLVM_VERSION}-dev" "libclang-rt-${LLVM_VERSION}-dev" @@ -49,6 +50,7 @@ EPHEMERAL=( libepoxy-dev libexpat1-dev libgbm-dev + libinput-dev libgles2-mesa-dev liblz4-dev libpciaccess-dev @@ -57,11 +59,13 @@ EPHEMERAL=( libudev-dev libwaffle-dev libx11-xcb-dev + libxcb-composite0-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxfixes-dev libxcb-ewmh-dev + libxcursor-dev libxext-dev libxkbcommon-dev libxrandr-dev @@ -94,12 +98,14 @@ DEPS=( jq kmod libasan8 + libcairo2 libcap2 libdrm2 libegl1 libepoxy0 libexpat1 libfdt1 + libinput10 "libclang-common-${LLVM_VERSION}-dev" "libclang-cpp${LLVM_VERSION}" "libllvm${LLVM_VERSION}" @@ -111,10 +117,12 @@ DEPS=( libvulkan1 libwayland-client0 libwayland-server0 + libxcb-composite0 libxcb-ewmh2 libxcb-randr0 libxcb-shm0 libxcb-xfixes0 + libxcursor1 libxkbcommon0 libxrandr2 libxrender1 @@ -136,7 +144,6 @@ DEPS=( sysvinit-core vulkan-tools waffle-utils - weston xwayland xinit xserver-xorg-video-amdgpu @@ -195,6 +202,10 @@ section_end debian_setup . .gitlab-ci/container/build-wayland.sh +############### Build Weston + +. .gitlab-ci/container/build-weston.sh + ############### Install Rust toolchain . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0583e45456d..afa651ba96e 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,7 +19,7 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BASE_TAG: "20250709-libwayland" + DEBIAN_BASE_TAG: "20250709-weston14" DEBIAN_BUILD_TAG: "20250710-libwayland"