Related: #47767
Attached patches should do this. I'll try to test at least the building part on a github runner, and to get this in to 3.1.0-beta2 already - so that any builds made of it would look for updates.
Note that S3_1 uses plain "macos" tag instead of tag of a unstable branch. As we've not used the tag in the past, there's no stable builds that would get tricked to think there's a new stable version.
Mac builds should have their own followtag. They may come a bit later than the main source code release.
As mac builds are already made with meson, this depends on #46493