Details

Reviewers

Brecht Van Lommel (brecht)
Campbell Barton (campbellbarton)
Bastien Montagne (mont29)

Commits

rBL62573: Linux libs: Update Mesa to 20.3.4

Summary

This resolves build error with Py3.9x, use meson build system
since autoconf/automake are no longer supported.

This adds ninja & meson as dependencies for Linux.

Needed to run mesa utilities with Python 3.9, see: https://cgit.freedesktop.org/mesa/mesa/commit/?id=6a841dbf4e4f0cb33bc36a8ba880a9bd6f6e7941

Edit: since running into this error on my first build, I'm no longer able to reproduce the Python failure, although Mesa-18.3.1 still contains the Python calls which are unsupported.

Now I'm running into a different linking error (below) which is resolved by updating to 20.3.4,
either way updating to a newer mesa allows make deps to build for me.

/usr/bin/ld: ../../../../src/gallium/auxiliary/.libs/libgallium.a(u_debug_symbol.o):(.bss+0x0): multiple definition of `symbols_hash'; ../../../../src/gallium/auxiliary/.libs/libgallium.a(u_debug_stack.o):(.bss+0x0): first defined here

Diff Detail

Repository

rB Blender

Branch

TEMP-DEPS-MESA-UPGRADE (branched from master)

Build Status

Buildable 12531
Build 12531: arc lint + arc unit

Event Timeline

Campbell Barton (campbellbarton) created this revision.Feb 2 2021, 12:11 AM

Harbormaster completed remote builds in B12530: Diff 33409.Feb 2 2021, 12:11 AM

Campbell Barton (campbellbarton) requested review of this revision.Feb 2 2021, 12:11 AM

Remove change from D10281

Harbormaster completed remote builds in B12531: Diff 33410.Feb 2 2021, 1:19 AM

Write to the temp directory, since "${BUILD_DIR}/mesa/src/external_mesa" doesn't exist on first build.

Harbormaster completed remote builds in B12535: Diff 33415.Feb 2 2021, 4:02 AM

Campbell Barton (campbellbarton) retitled this revision from cmake/deps: Update mesa to 20.3.4 (resolves build error w/ Py3.9x, use meson build system) to cmake/deps: Update mesa to 20.3.4.Feb 2 2021, 8:08 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Feb 2 2021, 8:11 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Feb 2 2021, 8:17 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

Campbell Barton (campbellbarton) added reviewers: Sybren A. Stüvel (sybren), Brecht Van Lommel (brecht), Bastien Montagne (mont29).Feb 2 2021, 10:43 AM

Not maintaining the build_environment thing, so removing myself from reviewers. Changes make sense to me though.

build_files/build_environment/cmake/check_software.cmake should be updated to include meson and ninja.

Beyond that, if running ./blender-softwaregl works, looks good to me.

Add ninja & meson to check_software.cmake

Harbormaster completed remote builds in B12600: Diff 33528.Feb 4 2021, 7:20 AM

Correct macOS/Debian commands (were swapped)

Harbormaster completed remote builds in B12601: Diff 33529.Feb 4 2021, 7:27 AM

Brecht Van Lommel (brecht) added inline comments.Feb 4 2021, 1:53 PM

build_files/build_environment/cmake/check_software.cmake
31–32 ↗	(On Diff #33529)	These are not needed on macOS.

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Feb 6 2021, 12:05 AM

Remove ninja for mesa dependency for macOS

Harbormaster completed remote builds in B12680: Diff 33655.Feb 6 2021, 12:05 AM

Campbell Barton (campbellbarton) mentioned this in T85365: Libraries Changes for Blender 2.93.Feb 6 2021, 12:17 AM

Brecht Van Lommel (brecht) accepted this revision.Feb 6 2021, 4:49 PM

This revision is now accepted and ready to land.Feb 6 2021, 4:49 PM

Remove extra slash (cleaned up in master)

Harbormaster completed remote builds in B12735: Diff 33737.Feb 9 2021, 12:01 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)Feb 9 2021, 12:02 AM

Building mesa is failing on my CentOS VM:

Program python3 found: YES (/usr/bin/python3)

meson.build:881:2: ERROR: Problem encountered: Python (3.x) mako module >= 0.8.0 required to build mesa.

So there are two issues:

the wrong python3 executable is used, and
the mako module isn't available.

From the mesa documentation I couldn't figure out whether the requirements (Python+Mako) are build-time or run-time requirements.

To make Meson (the build system) find the right Python, this can be added to native-files.ini-generator-script:

python = '${LIBDIR}/python/bin/python3'"

To work around the missing mako and keeping it separate from the rest of the system, I made a virtualenv, installed mako there, and pointed to it in the native-files.ini. This works, but then make external_mesa stops with this error:

Build-time dependency wayland-scanner found: NO (tried pkgconfig and cmake)

meson.build:1696:2: ERROR: Dependency "wayland-scanner" not found, tried pkgconfig and cmake

I could work around this by adding -Dplatforms=x11 to MESA_EXTRA_FLAGS, but of course this should only be done on Linux.

@Campbell Barton (campbellbarton) do you want to look into this, or shall I take over the patch?

build_files/build_environment/cmake/mesa.cmake
55	What's the reason that `.../external_mesa/build` is used, instead of the common `.../external_mesa-build`?

This revision now requires changes to proceed.Feb 9 2021, 5:03 PM

Campbell Barton (campbellbarton) updated this revision to Diff 33814.Feb 10 2021, 6:06 AM

Campbell Barton (campbellbarton) edited the summary of this revision. (Show Details)

This comment was removed by Campbell Barton (campbellbarton).

Harbormaster completed remote builds in B12779: Diff 33814.Feb 10 2021, 6:06 AM

Campbell Barton (campbellbarton) updated this revision to Diff 33815.Feb 10 2021, 6:16 AM

This comment was removed by Campbell Barton (campbellbarton).

Harbormaster completed remote builds in B12780: Diff 33815.Feb 10 2021, 6:16 AM

Accidentally updated wrong diff, correcting.

Harbormaster completed remote builds in B12782: Diff 33817.Feb 10 2021, 6:19 AM

Use conventional build path ${BUILD_DIR}/mesa/src/external_mesa-build

Harbormaster completed remote builds in B12784: Diff 33819.Feb 10 2021, 6:47 AM

@Sybren A. Stüvel (sybren)

I'd assume python3+mako are build-time only requirements since they're used for code-generation.
Setting python in the native-files.ini file seems fine.
-Dplatforms=x11 seems OK for now too, although we will eventually want to support wayland, note that mesa is only build on non-macOS Unix so I don't think that's a problem.
I wasn't aware of the *-build/ convention, updated.

Would you mind taking the patch from here? I could do this but I'd need to setup a centOS VM.

build_files/build_environment/cmake/mesa.cmake
55	I wasn't aware this was the convention, +1

Campbell Barton (campbellbarton) marked an inline comment as done and an inline comment as not done.Feb 10 2021, 6:56 AM

Would you mind taking the patch from here? I could do this but I'd need to setup a centOS VM.

Sure.

This revision is now accepted and ready to land.Feb 11 2021, 2:13 PM

Setting python in the native-files.ini file seems fine.

After further investigation, this doesn't seem necessary. The CentOS VM setup script I inherited from Sergey already installed the python-mako package locally for Mesa. I guess the Mesa upgrade now causes it to find python 3 by default, and the CentOS mako package is only available for 2.7. Since using a local Python is fine, I'll just locally install Mako for py3 and leave it at that. That'll avoid "polluting" our own Python with a package Blender doesn't need.