From 6e98c0dfd10007da590e0c1b1ab59d031aada715 Mon Sep 17 00:00:00 2001 From: Leandro Ribeiro Date: Tue, 23 Nov 2021 10:44:42 -0300 Subject: [PATCH] CI: bump mesa and wayland-protocol versions for dma-buf feedback Bump the wayland-protocol dependency version in order to include dma-buf feedback, whose support in Weston is added in the next commits. Also, as we need the newer EGL extension EGL_EXT_device_drm_render_node to add the support for dma-buf feedback, bump the Mesa dependency version as well. It also includes some minor changes in order to keep build-deps.sh more consistent. Signed-off-by: Leandro Ribeiro --- .gitlab-ci.yml | 2 +- .gitlab-ci/build-deps.sh | 13 +++++-------- protocol/meson.build | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c238e433..db89c7be 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: '2021-11-25.2-bullseye-sphinx' + FDO_DISTRIBUTION_TAG: '2021-11-25.0-dmabuf-feedback' include: diff --git a/.gitlab-ci/build-deps.sh b/.gitlab-ci/build-deps.sh index 816a6585..bce36e92 100755 --- a/.gitlab-ci/build-deps.sh +++ b/.gitlab-ci/build-deps.sh @@ -106,14 +106,12 @@ rm -rf wayland # Keep this version in sync with our dependency in meson.build. If you wish to # raise a MR against custom protocol, please change this reference to clone # your relevant tree, and make sure you bump $FDO_DISTRIBUTION_TAG. -git clone --branch 1.19 https://gitlab.freedesktop.org/wayland/wayland-protocols +git clone --branch 1.24 --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols cd wayland-protocols git show -s HEAD -mkdir build -cd build -../autogen.sh -make install -cd ../../ +meson build +ninja ${NINJAFLAGS} -C build install +cd .. rm -rf wayland-protocols # Build and install our own version of Mesa. Debian provides a perfectly usable @@ -123,9 +121,8 @@ rm -rf wayland-protocols # features from Mesa then bump this version and $FDO_DISTRIBUTION_TAG, however # please be prepared for some of the tests to change output, which will need to # be manually inspected for correctness. -git clone --single-branch --branch 20.3 --shallow-since='2020-12-15' https://gitlab.freedesktop.org/mesa/mesa.git mesa +git clone --branch 21.3 --depth=1 https://gitlab.freedesktop.org/mesa/mesa.git cd mesa -git checkout -b snapshot mesa-20.3.1 meson build -Dauto_features=disabled \ -Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers= ninja ${NINJAFLAGS} -C build install diff --git a/protocol/meson.build b/protocol/meson.build index e0b5b7ac..7d869dad 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -1,7 +1,7 @@ dep_scanner = dependency('wayland-scanner', native: true) prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) -dep_wp = dependency('wayland-protocols', version: '>= 1.19') +dep_wp = dependency('wayland-protocols', version: '>= 1.24') dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir') install_data(