Use Meson for mpv instead of Waf #2359

RivenSkaye · 2023-01-05T13:46:03Z

Pull request that translates Waf options to their Meson equivalents at runtime, fixing #2346
Also ensures any flags guaranteed to be illegal on Windows are disabled, with a warning sent to the user.

Still has one call to waf distclean, since that doesn't hang up and will allow for users to keep using existing envs. That call can be removed later, when it can be reasonably assumed nobody who's remotely up-to-date has Waf artifacts left that might interfere with the build.
A side effect of this change is the removal of the option to build mruby support into mpv, as the relevant branch has been dead since 2017 and can't be built with Meson.
Work on this also brought to light something else, due to Meson being a lot less forgiving when it comes to impossible combinations and configure flags. There is currently no way to explicitly enable d3d11 and spirv-cross flags due to #2358 blocking the build of spirv-cross-c-shared. It seems like all of the Vulkan stuff that relies on SPIR-V works so long as the shared tools are built, which still happens with the spirv-meson patch.

I'm opening this PR as a draft because this still needs some considerable cleanup. Things like the extra LDFLAGS being set in order to allow linking mpv to libarchive without undefined symbol references. I'm not exactly sure why these changes were needed to make mpv build properly, as I got it to work just fine standalone. This only seemed to be a problem within the context of the Suite.

RivenSkaye · 2023-01-06T08:47:00Z

build/media-suite_compile.sh

+            elif [[ $option =~ ^--enable-(cocoa|drm|egl-android|*-drm|*-wayland|*-x11|*-cocoa|gbm|rpi|vdpau|vdpau-*|vaapi|vaapi-*|wayland|x11|xv) ]]; then
+                meson_opts+=("${option/--enable-/-D}=disabled")
+                do_simple_print "${orange}Disabling option '${option}' as it's not usable on Windows"'!'"${reset}"
+            elif [[ $option =~ ^--enable-(caca|d3d11|direct3d|egl|egl-*|plain-gl|gl|gl-*|jpeg|libplacebo|sdl2-video|shaderc|sixel|spirv-cross|vulkan) ]]; then


I'll have to change this one a bit, as the suite doesn't include sixel (yet) and there's no release that can be grabbed from the repos

RivenSkaye · 2023-01-06T08:48:00Z

build/media-suite_compile.sh

+                meson_opts+=("${option/--enable-/-D}=enabled")
+            elif [[ $option =~ ^--disable-(html-build|manpage-build) ]]; then
+                meson_opts+=("${option/--disable-/-D}=disabled")
+            elif [[ $option =~ ^--enable-pdf-build ]]; then


Remnant of the old code, which silently and unconditionally disabled PDF doc builds, but this needs to be tested

RivenSkaye

Partial feedback for myself, some questions for the maintainers.
I turned on maintainer edits for the PR, so if there's things you'd like to tackle, feel free to add it to the PR

RivenSkaye · 2023-01-06T08:51:34Z

build/media-suite_compile.sh

+            RST2PDF="${MINGW_PREFIX}/bin/rst2pdf2"
+        mkdir build
+        PKG_CONFIG="pkgconf --keep-system-libs --keep-system-cflags" CC=${CC/ccache /}.bat CXX=${CXX/ccache /}.bat \
+            log "meson.setup" meson setup build "${meson_opts[@]}" --prefix="${LOCALDESTDIR}" --bindir="${LOCALDESTDIR}/bin-video" --default-library="${default_lib}" --buildtype=release


log names are non-standard atm, but I expect there to be more changes required to the Meson calls.
Kept this order for now so that it

doesn't break existing mpv_extra.sh setups

I wanted it to work first, and then adapt it to use the helper functions later

RivenSkaye · 2023-01-06T08:52:35Z

build/media-suite_compile.sh

-        log install /usr/bin/python waf -j1 install ||
-            log install /usr/bin/python waf -j1 install
+        cpuCount=1 log "meson.install" meson install -C build &&
+        mv "${LOCALDESTDIR}/bin-video/libmpv-2.dll" "$LOCALDESTDIR/bin-video/mpv-2.dll"


I can't find a way to tell Meson I don't want the output file to be named libmpv-2.dll, hence the manual move

RivenSkaye · 2023-01-06T08:53:56Z

build/media-suite_compile.sh

+        LDFLAGS="$old_ldf"
+        replace=" ${mpv_cflags[*]} -Wno-int-conversion"
+        CFLAGS="${CFLAGS/$replace}"
+        unset mpv_ldflags replace PKGCONF_STATIC meson_opts default_lib old_ldf


I'm not entirely happy with this cleanup, but it works:tm:
I'll look into extra-cflags options and similar for Meson

RivenSkaye · 2023-01-06T08:55:41Z

build/media-suite_compile.sh

+        for option in "${MPV_OPTS[@]}"; do
+            # Process Waf flags into Meson options.
+            # starting with boolean flags
+            if [[ $option =~ ^--enable-(gpl|cplayer|build-date|tests|ta-leak-report) ]]; then


TA Leak can only be turned off by also adjusting an env var; perhaps make some accessible entry point for people to inject the option from a custom patch instead of setting it here?

RivenSkaye · 2023-01-06T08:56:49Z

build/media-suite_compile.sh

+            elif [[ $option =~ ^--enable-(cocoa|drm|egl-android|*-drm|*-wayland|*-x11|*-cocoa|gbm|rpi|vdpau|vdpau-*|vaapi|vaapi-*|wayland|x11|xv) ]]; then
+                meson_opts+=("${option/--enable-/-D}=disabled")
+                do_simple_print "${orange}Disabling option '${option}' as it's not usable on Windows"'!'"${reset}"
+            elif [[ $option =~ ^--enable-(caca|d3d11|direct3d|egl|egl-*|plain-gl|gl|gl-*|jpeg|libplacebo|sdl2-video|shaderc|sixel|spirv-cross|vulkan) ]]; then


There's also some things to note about SPIRV-Cross, see issue linked in the initial comment on the PR

Quackdoc · 2023-01-13T20:00:51Z

PR to deprecate waf in mpv

mpv-player/mpv#11143

vt-idiot · 2024-04-19T00:02:48Z

~~Does this work?~~

It might. I am fairly certain openal will have to be explicitly disabled and the meson options actually have it disabled by default

mpv added some more fluff to make wasapi work better, but I think some ifndefs are missing. I can't really see a reason to use OpenAL over WASAPI on Windows to begin with...

FAILED: mpv.exe 
"gcc.bat" @mpv.exe.rsp
J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libopenal.a(uiddefs.cpp.o):uiddefs.cpp:(.rdata$KSDATAFORMAT_SUBTYPE_IEEE_FLOAT[KSDATAFORMAT_SUBTYPE_IEEE_FLOAT]+0x0): multiple definition of `KSDATAFORMAT_SUBTYPE_IEEE_FLOAT'; libmpv-2.dll.p/audio_out_ao_wasapi_utils.c.obj:ao_wasapi_util:(.rdata+0xcb0): first defined here
J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libopenal.a(uiddefs.cpp.o):uiddefs.cpp:(.rdata$KSDATAFORMAT_SUBTYPE_PCM[KSDATAFORMAT_SUBTYPE_PCM]+0x0): multiple definition of `KSDATAFORMAT_SUBTYPE_PCM'; libmpv-2.dll.p/audio_out_ao_wasapi_utils.c.obj:ao_wasapi_util:(.rdata+0xcc0): first defined here

collect2.exe: error: ld returned 1 exit status
[265/265] Linking target libmpv-2.dll
FAILED: libmpv-2.dll 
"gcc.bat" @libmpv-2.dll.rsp
J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libvulkan.a(loader_windows.c.obj):loader_windows:(.text+0x270): multiple definition of `DllMain'; J:/media-autobuild_suite-master/msys64/mingw64/lib/libmingwex.a(lib64_libmingwex_a-dllmain.o):C:/M/B/src/mingw-w64/mingw-w64-crt/crt/dllmain.c:10: first defined here
J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libopenal.a(uiddefs.cpp.o):uiddefs.cpp:(.rdata$KSDATAFORMAT_SUBTYPE_IEEE_FLOAT[KSDATAFORMAT_SUBTYPE_IEEE_FLOAT]+0x0): multiple definition of `KSDATAFORMAT_SUBTYPE_IEEE_FLOAT'; libmpv-2.dll.p/audio_out_ao_wasapi_utils.c.obj:ao_wasapi_util:(.rdata+0xcb0): first defined here
J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libopenal.a(uiddefs.cpp.o):uiddefs.cpp:(.rdata$KSDATAFORMAT_SUBTYPE_PCM[KSDATAFORMAT_SUBTYPE_PCM]+0x0): multiple definition of `KSDATAFORMAT_SUBTYPE_PCM'; libmpv-2.dll.p/audio_out_ao_wasapi_utils.c.obj:ao_wasapi_util:(.rdata+0xcc0): first defined here

collect2.exe: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
INFO: autodetecting backend as ninja
INFO: calculating backend command to run: J:\media-autobuild_suite-master\msys64\mingw64\bin/ninja.EXE -C J:/media-autobuild_suite-master/build/mpv/build

This one might be a showstopper though

J:/media-autobuild_suite-master/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/13.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: J:/media-autobuild_suite-master/local64/lib/libvulkan.a(loader_windows.c.obj):loader_windows:(.text+0x270): multiple definition of `DllMain'; J:/media-autobuild_suite-master/msys64/mingw64/lib/libmingwex.a(lib64_libmingwex_a-dllmain.o):C:/M/B/src/mingw-w64/mingw-w64-crt/crt/dllmain.c:10: first defined here

RivenSkaye · 2024-04-19T05:16:35Z

I mean, last I touched it I managed to produce a build. If that counts as working, then yes. But for all intents and purposes it needs a fair amount of TLC and I currently just cannot spare the time to wrangle with upstream changes on mpv at the moment

vt-idiot · 2024-04-19T19:25:00Z

I did get past the OpenAL issues by disabling it in ffmpeg, rebuilding, and going again. libvulkan's DllMain is going to be an issue for building libmpv-2.dll unless there's a different way of patching vulkan-loader. I put a couple hours into it and couldn't make heads or tails of it.

RivenSkaye · 2024-04-19T22:52:22Z

Huh, last time I ran a build off upstream I couldn't get vulkan to work properly either, and it has also been a bit iffy on Arch to get everything to play nice.

And yes, spending a few hours on it sounds like pretty much every step of the way I already had into this PR. Hence why time is an issue, I'd almost miss my student years with no household of my own to run...

vt-idiot · 2024-04-19T23:40:32Z

Might be worth looking at https://github.com/shinchiro/mpv-winbuild-cmake/tree/master/packages if you ever get the chance.

1480c1 · 2024-04-20T02:53:16Z

I'm thinking perhaps we just go the nuke route and just move the old option file and make a new one.

The main thing I'm concerned about is the whole enable/disable and using that logic with stuff that might not adhere to it with meson, like instead of enable/disable, some options might be bools. We may instead need to introduce a different set of stuff for meson and like mpv_enable() and mpv_true() or something with different arrays for the different types.

vt-idiot · 2024-04-21T04:23:51Z

I'm thinking perhaps we just go the nuke route and just move the old option file and make a new one.

Not a bad idea. One issue (maybe 2?) I did run into is that even in a fresh environment, libvulkan causes it to fail because of the DllMain definition.

Also the way spirv-cross currently builds probably still needs to be addressed, I'm not sure why it still uses all that meson patchwork when there is now a build system in-place upstream.

1480c1 · 2024-05-02T05:21:40Z

realized there may be more pains with meson considering the user could do something like

-D option=enable

Need to do a lot more worrying about parsing on bash's side, past just slurping up the arguments

RivenSkaye · 2024-05-02T08:43:10Z

That's why my current rough draft is just parsing the existing options files. I say we butcher the config generation in three places.

Initial setup, where we only write non-default features (and explicit non-options due to Windows constraints)
Before we finalize setup and start the first build, based on relevant environment variables and args passed with a -D prefix
Before the actual build of mpv itself, once all patches and additional user scripts have ran and set their info. If this changes settings in a breaking way, we ask the user to check their custom scripts.

If we don't yet, it might be worthwhile to set a flag to see if the user added any custom scripts (perhaps echo `cygpath -wa $script_path` >> .userscripts.log or something?)

We'd then probably end up with a glorified commandline in a file, but we at least wouldn't have to worry about parsing the contents anymore

RivenSkaye added 7 commits January 2, 2023 14:52

Testing this locally rn

1c0ffee

This should work:tm:

1c0ffee

This is cleaner imo

1c0ffee

Chop chop?

1c0ffee

This might work, but ffmpeg broke so no dice

1c0ffee

mpv builds and installs successfully!

1c0ffee

Cleanup CFLAGS for builds coming after

1c0ffee

RivenSkaye commented Jan 6, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Meson for mpv instead of Waf #2359

Use Meson for mpv instead of Waf #2359

RivenSkaye commented Jan 5, 2023

RivenSkaye Jan 6, 2023

RivenSkaye Jan 6, 2023

RivenSkaye left a comment

RivenSkaye Jan 6, 2023

RivenSkaye Jan 6, 2023

RivenSkaye Jan 6, 2023

RivenSkaye Jan 6, 2023

RivenSkaye Jan 6, 2023

Quackdoc commented Jan 13, 2023 •

edited

Loading

vt-idiot commented Apr 19, 2024 •

edited

Loading

RivenSkaye commented Apr 19, 2024 •

edited

Loading

vt-idiot commented Apr 19, 2024

RivenSkaye commented Apr 19, 2024

vt-idiot commented Apr 19, 2024

1480c1 commented Apr 20, 2024

vt-idiot commented Apr 21, 2024

1480c1 commented May 2, 2024

RivenSkaye commented May 2, 2024

Use Meson for mpv instead of Waf #2359

Are you sure you want to change the base?

Use Meson for mpv instead of Waf #2359

Conversation

RivenSkaye commented Jan 5, 2023

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye left a comment

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

RivenSkaye Jan 6, 2023

Choose a reason for hiding this comment

Quackdoc commented Jan 13, 2023 • edited Loading

vt-idiot commented Apr 19, 2024 • edited Loading

RivenSkaye commented Apr 19, 2024 • edited Loading

vt-idiot commented Apr 19, 2024

RivenSkaye commented Apr 19, 2024

vt-idiot commented Apr 19, 2024

1480c1 commented Apr 20, 2024

vt-idiot commented Apr 21, 2024

1480c1 commented May 2, 2024

RivenSkaye commented May 2, 2024

Quackdoc commented Jan 13, 2023 •

edited

Loading

vt-idiot commented Apr 19, 2024 •

edited

Loading

RivenSkaye commented Apr 19, 2024 •

edited

Loading