mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: bump mesa and wayland-protocol versions for dma-buf feedback

Browse Source 
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 <leandro.ribeiro@collabora.com>
This commit is contained in:
Leandro Ribeiro 2021-11-23 10:44:42 -03:00
parent b4e70a49ef
commit 6e98c0dfd1
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -43,7 +43,7 @@
variables: variables:
FDO_UPSTREAM_REPO: wayland/weston FDO_UPSTREAM_REPO: wayland/weston
FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" 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: include:

13
.gitlab-ci/build-deps.sh
View File

@ -106,14 +106,12 @@ rm -rf wayland
# Keep this version in sync with our dependency in meson.build. If you wish to # 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 # raise a MR against custom protocol, please change this reference to clone
# your relevant tree, and make sure you bump $FDO_DISTRIBUTION_TAG. # 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 cd wayland-protocols
git show -s HEAD git show -s HEAD
mkdir build meson build
cd build ninja ${NINJAFLAGS} -C build install
../autogen.sh cd ..
make install
cd ../../
rm -rf wayland-protocols rm -rf wayland-protocols
# Build and install our own version of Mesa. Debian provides a perfectly usable # 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 # 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 # please be prepared for some of the tests to change output, which will need to
# be manually inspected for correctness. # 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 cd mesa
git checkout -b snapshot mesa-20.3.1
meson build -Dauto_features=disabled \ meson build -Dauto_features=disabled \
-Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers= -Dgallium-drivers=swrast -Dvulkan-drivers= -Ddri-drivers=
ninja ${NINJAFLAGS} -C build install ninja ${NINJAFLAGS} -C build install

2
protocol/meson.build
View File

@ -1,7 +1,7 @@
dep_scanner = dependency('wayland-scanner', native: true) dep_scanner = dependency('wayland-scanner', native: true)
prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner')) 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') dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
install_data( install_data(