Build: add wayland to deps build
ClosedPublic
Actions

Authored by Campbell Barton (campbellbarton) on Sep 27 2022, 1:24 AM.

Details

Reviewers

Sebastian Parborg (zeddb)
Brecht Van Lommel (brecht)
Sybren A. Stüvel (sybren)

Summary

This is needed to ensure and up to date "wayland-scanner" is used,
as versions before 1.20.0 generate headers incompatible with
dynamic linking (WITH_GHOST_WAYLAND_DYNLOAD).

As the centos7 version of wayland is 1.15 so make this part of Blender's dependencies on Linux.

We intend to enable Wayland for Blender 3.4 release, this is needed for the build-bot.

Notes:

The dependency is fairly small, 224K XZ file.
https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-1.21.0.tar.xz will have to be committed to https://svn.blender.org/svnroot/bf-blender/trunk/lib/packages/ separately.

Diff Detail

Repository

rB Blender

Branch

TEMP-WAYLAND-BUILD-ENV (branched from master)

Build Status

Buildable 23948
Build 23948: arc lint + arc unit

Event Timeline

Campbell Barton (campbellbarton) requested review of this revision.Sep 27 2022, 1:24 AM

Campbell Barton (campbellbarton) created this revision.

Harbormaster completed remote builds in B23948: Diff 56154.Sep 27 2022, 1:24 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Sep 27 2022, 1:30 AM

Campbell Barton (campbellbarton) added reviewers: Sybren A. Stüvel (sybren), Sebastian Parborg (zeddb), Brecht Van Lommel (brecht).

Campbell Barton (campbellbarton) added a project: Platform: Linux.

Brecht Van Lommel (brecht) added inline comments.Sep 27 2022, 2:19 AM

build_files/build_environment/cmake/wayland.cmake
8	My `wayland-scanner` seems to have a dependency on system libexpat, not sure if we can rely on that being available on all systems used to build Blender. We are building static libexpat as one of the libs, maybe there's a way to link against that.
build_files/cmake/platform/platform_unix.cmake
766	I'd change this to: if(EXISTS "${LIBDIR}" AND EXIST "${LIBDIR}/wayland/bin/wayland-scanner") Just to make it a bit more robust to bisecting or other switching between git revisions.

Add note that wayland can be removed when the buildbot upgrades it's wayland version.

Harbormaster completed remote builds in B23949: Diff 56155.Sep 27 2022, 2:25 AM

Check the wayland-scanner binary exists before using (not just LIBDIR).
Link against our statically compiled libexpat.

Harbormaster completed remote builds in B23950: Diff 56156.Sep 27 2022, 3:30 AM

Campbell Barton (campbellbarton) marked 2 inline comments as done.Sep 27 2022, 3:31 AM

Rebase on master.

Harbormaster completed remote builds in B23952: Diff 56158.Sep 27 2022, 3:56 AM

Brecht Van Lommel (brecht) accepted this revision.Sep 27 2022, 5:56 AM

This revision is now accepted and ready to land.Sep 27 2022, 5:56 AM

For context, there is an intent to enable Wayland for Blender 3.4, and this is required to make that work on the buildbot.

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Sep 27 2022, 11:09 AM

Campbell Barton (campbellbarton) mentioned this in rBcbab73444506: Build: add wayland to deps build.Sep 27 2022, 11:23 AM

Campbell Barton (campbellbarton) mentioned this in rBL63039: Add wayland package.Sep 27 2022, 11:29 AM

I can't download the sources from https://wayland.freedesktop.org/releases/wayland-1.21.0.tar.xz so this change breaks make deps for me. I have the correct URL, so I'll commit that to master.

This patch was already landed, without any update to its status or an explanation as to why it had to land so quickly without, apparently, proper testing. Why was that?

UPDATE: After fixing the download URL, I still can't build Wayland on CentOS7:

The Meson build system
Version: 0.55.1
Source dir: /home/sybren/buildbot-builder/linux_glibc217_x86_64_cmake/build_deps/deps/build/wayland/src/external_wayland
Build dir: /home/sybren/buildbot-builder/linux_glibc217_x86_64_cmake/build_deps/deps/build/wayland/src/external_wayland-build
Build type: native build

../external_wayland/meson.build:1:0: ERROR: Meson version is 0.55.1 but project requires >= 0.56.0

I'm now hacking the wayland meson.build file so that it declares an older version of meson to at least get it to start building. Now it complains that libffi, libxml-2.0, and dot cannot be found, so apparently there are new deps-build-time dependencies.

UPDATE: the dot dependency can be removed by passing -Ddocumentation=false.

The same kind of options can be used to avoid building the tests, or to even avoid installing the libraries. Since this patch is meant to only install wayland-scanner, we could pass -Dlibraries=false as well and avoid having libs we don't intend to use.

Sybren A. Stüvel (sybren) requested changes to this revision.Sep 27 2022, 1:58 PM

This revision now requires changes to proceed.Sep 27 2022, 1:58 PM

Brecht Van Lommel (brecht) mentioned this in T101403: Library changes for Blender 3.4.Sep 27 2022, 2:12 PM

Campbell Barton (campbellbarton) mentioned this in rBf6664217b321: Build: temporarily disable wayland dependency.Sep 27 2022, 2:31 PM

Disabled wayland as part of build deps rBf6664217b3214be869afb732d1d5bfc471a88e9a until issues can be sorted out.

Sybren A. Stüvel (sybren) mentioned this in rBL63040: Linux: wayland-scanner.Sep 27 2022, 3:11 PM

Sybren A. Stüvel (sybren) mentioned this in rBf3a46e2fd93f: Deps: fix builing wayland-scanner.

I've committed a proper fix.

This revision is now accepted and ready to land.Sep 27 2022, 3:19 PM

Campbell Barton (campbellbarton) closed this revision.Sep 28 2022, 12:06 AM