fdo-mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-12-24 14:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Bump to meson version 0.64.0

Browse source 
This version will be required in the next commit.

Bumps the CI image to get the required version from the debian package
instead of from pip.

Removes the bindir builtin directory from pkgconfig.generate() which is
deprecated since 0.62.0. It will be automatically included when
referenced.

Use `meson setup` everywhere instead of relying on deprecated automatic
detection of the setup command.

Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
This commit is contained in:
Sebastian Wick 2025-10-28 12:11:10 +01:00 • committed by Pekka Paalanen
parent dfab16e236
commit c8a0996703
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -78,11 +78,10 @@ workflow:
variables: variables:
BUILD_OS: debian BUILD_OS: debian
FDO_DISTRIBUTION_VERSION: bookworm FDO_DISTRIBUTION_VERSION: bookworm
FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl python3-pip python3-setuptools ninja-build' FDO_DISTRIBUTION_PACKAGES: 'build-essential pkg-config libexpat1-dev libffi-dev libxml2-dev doxygen graphviz xmlto xsltproc docbook-xsl meson ninja-build'
FDO_DISTRIBUTION_EXEC: 'pip3 install --break-system-packages meson~=0.57.2'
# bump this tag every time you change something which requires rebuilding the # bump this tag every time you change something which requires rebuilding the
# base image # base image
FDO_DISTRIBUTION_TAG: "2025-01-21.1" FDO_DISTRIBUTION_TAG: "2025-10-28.1"
.debian-x86_64: .debian-x86_64:
extends: extends:
@ -223,11 +222,10 @@ armv7-debian-container_prep:
- .ci-rules - .ci-rules
stage: "Build and test" stage: "Build and test"
script: script:
- cd "$BUILDDIR" - meson setup $BUILDDIR --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE}
- meson --prefix="$PREFIX" -Dicon_directory=/usr/share/X11/icons --fatal-meson-warnings -Dwerror=true ${MESON_BUILD_TYPE} .. - ninja -C $BUILDDIR -k0 -j${FDO_CI_CONCURRENT:-4}
- ninja -k0 -j${FDO_CI_CONCURRENT:-4} - meson test -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4}
- meson test --num-processes ${FDO_CI_CONCURRENT:-4} - ninja -C $BUILDDIR clean
- ninja clean
artifacts: artifacts:
name: wayland-$CI_JOB_NAME name: wayland-$CI_JOB_NAME
when: always when: always
@ -250,7 +248,7 @@ armv7-debian-container_prep:
# the workspace to see details about the failed tests. # the workspace to see details about the failed tests.
- | - |
set +e set +e
/app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson $BUILDDIR --prefix=$PREFIX $MESON_BUILD_TYPE $MESON_ARGS && ninja -C $BUILDDIR -j${FDO_CI_CONCURRENT:-4}" /app/vmctl exec "pkg info; cd $CI_PROJECT_NAME ; meson setup $BUILDDIR --prefix=$PREFIX $MESON_BUILD_TYPE $MESON_ARGS && ninja -C $BUILDDIR -j${FDO_CI_CONCURRENT:-4}"
/app/vmctl exec "meson test --print-errorlogs -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4}" && touch .tests-successful /app/vmctl exec "meson test --print-errorlogs -C $BUILDDIR --num-processes ${FDO_CI_CONCURRENT:-4}" && touch .tests-successful
set -ex set -ex
scp -r vm:$BUILDDIR/meson-logs . scp -r vm:$BUILDDIR/meson-logs .

2
meson.build
View file

@ -2,7 +2,7 @@ project(
'wayland', 'c', 'wayland', 'c',
version: '1.24.90', version: '1.24.90',
license: 'MIT', license: 'MIT',
meson_version: '>= 0.57.0', meson_version: '>= 0.64.0',
default_options: [ default_options: [
'warning_level=2', 'warning_level=2',
'buildtype=debugoptimized', 'buildtype=debugoptimized',

1
src/meson.build
View file

@ -66,7 +66,6 @@ if get_option('scanner')
variables: [ variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')), 'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()), 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'wayland_scanner=${bindir}/wayland-scanner' 'wayland_scanner=${bindir}/wayland-scanner'
], ],
filebase: 'wayland-scanner' filebase: 'wayland-scanner'