diff options
| author | Dudemanguy <random342@airmail.cc> | 2021-11-07 13:29:11 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2021-11-14 19:13:10 +0000 |
| commit | 31780a6db5d31c6ed5c92a64a5f3bd349950f547 (patch) | |
| tree | 9c78c87be8f89df156fd38617b4b5bb3857e85ea /ci/build-macos.sh | |
| parent | ff322864f2878a35b277111e509da03fe6f888bd (diff) | |
| download | mpv-31780a6db5d31c6ed5c92a64a5f3bd349950f547.tar.bz2 mpv-31780a6db5d31c6ed5c92a64a5f3bd349950f547.tar.xz | |
ci: add meson builds
Update the github workflows to also do meson builds for every OS.
Additionally, make every workflow execute the built mpv executable
(except for windows and FreeBSD's waf executable) to make sure that it
runs. As an aside, FreeBSD unfortunately is a bit less elegant since it
is in a VM.
Diffstat (limited to 'ci/build-macos.sh')
| -rwxr-xr-x | ci/build-macos.sh | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/ci/build-macos.sh b/ci/build-macos.sh index cf3fbb3509..6e6456c154 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -10,18 +10,35 @@ if [[ -d "./build/${MPV_VARIANT}" ]] ; then rm -rf "./build/${MPV_VARIANT}" fi -if [[ ! -e "./waf" ]] ; then - python3 ./bootstrap.py +if [[ $1 = "meson" ]]; then + PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \ + meson build \ + -Dprefix="${MPV_INSTALL_PREFIX}" \ + -Dlibmpv=true \ + -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \ + -D{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl}=enabled + + meson compile -C build -j4 + + meson install -C build + ./build/mpv fi -PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \ - ./waf configure \ - --variant="${MPV_VARIANT}" \ - --prefix="${MPV_INSTALL_PREFIX}" \ - --enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \ - --enable-{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl} \ - --swift-flags="${CI_SWIFT_FLAGS}" +if [[ $1 = "waf" ]]; then + if [[ ! -e "./waf" ]] ; then + python3 ./bootstrap.py + fi -python3 ./waf build --variant="${MPV_VARIANT}" -j4 + PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \ + ./waf configure \ + --variant="${MPV_VARIANT}" \ + --prefix="${MPV_INSTALL_PREFIX}" \ + --enable-{gl,iconv,lcms2,libmpv-shared,lua,jpeg,plain-gl,zlib} \ + --enable-{cocoa,coreaudio,gl-cocoa,macos-cocoa-cb,macos-touchbar,videotoolbox-gl} \ + --swift-flags="${CI_SWIFT_FLAGS}" -python3 ./waf install --variant="${MPV_VARIANT}" + python3 ./waf build --variant="${MPV_VARIANT}" -j4 + + python3 ./waf install --variant="${MPV_VARIANT}" + ./build/mpv +fi |