summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorLaserEyess <lasereyess@users.noreply.github.com>2022-11-12 09:27:07 -0500
committerDudemanguy <random342@airmail.cc>2023-07-23 19:55:51 +0000
commitf2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77 (patch)
treec5c7f21eb2e1556265655d166ea0bee258376d5b /ci
parent60a263246e03d23c894ae0ef6bbfa29a5f1855dc (diff)
downloadmpv-f2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77.tar.bz2
mpv-f2cce5f38f4031bf1a4b4919ec90e4e8f8c66a77.tar.xz
waf: remove waf as a build system
Remove waf entirely in favor of meson as the only supported build system. Waf was officially deprecated in 0.36.0, and has not been preferred over meson since 0.35.0.
Diffstat (limited to 'ci')
-rwxr-xr-xci/build-freebsd.sh24
-rwxr-xr-xci/build-macos.sh41
-rwxr-xr-xci/build-mingw64.sh21
-rwxr-xr-xci/build-msys2.sh86
-rwxr-xr-xci/build-tumbleweed.sh44
5 files changed, 57 insertions, 159 deletions
diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh
index 39afe57f2d..67fdb2747a 100755
--- a/ci/build-freebsd.sh
+++ b/ci/build-freebsd.sh
@@ -24,27 +24,3 @@ meson setup build \
meson compile -C build
./build/mpv -v --no-config
-
-if [ ! -e "./waf" ] ; then
- python3 ./bootstrap.py
-fi
-
-python3 ./waf configure \
- --out=build_waf \
- --enable-libmpv-shared \
- --enable-lua \
- --enable-egl-drm \
- --enable-openal \
- --enable-sdl2 \
- --enable-sndio \
- --enable-vdpau \
- --enable-vulkan \
- --enable-oss-audio \
- $(pkg info -q v4l_compat && echo --enable-dvbin) \
- $(pkg info -q libdvdnav && echo --enable-dvdnav) \
- $(pkg info -q libcdio-paranoia && echo --enable-cdda) \
- $(pkg info -q pipewire && echo --enable-pipewire) \
- $NULL
-
-python3 ./waf build
-./build_waf/mpv -v --no-config
diff --git a/ci/build-macos.sh b/ci/build-macos.sh
index 3b3255b8a6..14b3a1b934 100755
--- a/ci/build-macos.sh
+++ b/ci/build-macos.sh
@@ -10,34 +10,13 @@ if [[ -d "./build/${MPV_VARIANT}" ]] ; then
rm -rf "./build/${MPV_VARIANT}"
fi
-if [[ $1 = "meson" ]]; then
- PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \
- meson setup build \
- -Dprefix="${MPV_INSTALL_PREFIX}" \
- -D{libmpv,tests}=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 -v --no-config
-fi
-
-if [[ $1 = "waf" ]]; then
- if [[ ! -e "./waf" ]] ; then
- python3 ./bootstrap.py
- fi
-
- PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" python3 \
- ./waf configure \
- --out=build_waf \
- --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 build --variant="${MPV_VARIANT}" -j4
- python3 ./waf install --variant="${MPV_VARIANT}"
- ${MPV_INSTALL_PREFIX}/bin/mpv -v --no-config
-fi
+PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \
+meson setup build \
+ -Dprefix="${MPV_INSTALL_PREFIX}" \
+ -D{libmpv,tests}=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 -v --no-config
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh
index 0b3c930be1..5dadcde646 100755
--- a/ci/build-mingw64.sh
+++ b/ci/build-mingw64.sh
@@ -198,21 +198,12 @@ LDFLAGS+=" -L'$prefix_dir/lib'"
export CFLAGS LDFLAGS
rm -rf build
-if [ "$1" = "meson" ]; then
- meson setup build --cross-file "$prefix_dir/crossfile" \
- --buildtype debugoptimized \
- -Dlibmpv=true -Dlua=luajit \
- -D{shaderc,spirv-cross,d3d11,libplacebo,libplacebo-next}=enabled
-
- meson compile -C build
-elif [ "$1" = "waf" ]; then
- PKG_CONFIG=pkg-config ./waf configure \
- --out=build_waf \
- --enable-libmpv-shared --lua=luajit \
- --enable-{shaderc,spirv-cross,d3d11,libplacebo,libplacebo-next}
-
- ./waf build
-fi
+meson setup build --cross-file "$prefix_dir/crossfile" \
+ --buildtype debugoptimized \
+ -Dlibmpv=true -Dlua=luajit \
+ -D{shaderc,spirv-cross,d3d11,libplacebo,libplacebo-next}=enabled
+
+meson compile -C build
if [ "$2" = pack ]; then
mkdir -p artifact
diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
index 5f83370077..2a17a8465e 100755
--- a/ci/build-msys2.sh
+++ b/ci/build-msys2.sh
@@ -1,60 +1,30 @@
#!/bin/sh -e
-if [ "$1" = "meson" ]; then
- python3.11 -m venv venv
- source ./venv/bin/activate
- python -m pip install meson
- meson setup build \
- -D cdda=enabled \
- -D d3d-hwaccel=enabled \
- -D d3d11=enabled \
- -D dvdnav=enabled \
- -D egl-angle-lib=enabled \
- -D egl-angle-win32=enabled \
- -D jpeg=enabled \
- -D lcms2=enabled \
- -D libarchive=enabled \
- -D libbluray=enabled \
- -D libmpv=true \
- -D libplacebo=enabled \
- -D lua=enabled \
- -D pdf-build=enabled \
- -D rubberband=enabled \
- -D shaderc=enabled \
- -D spirv-cross=enabled \
- -D tests=true \
- -D uchardet=enabled \
- -D vapoursynth=enabled \
- -D vulkan=enabled
- meson compile -C build
- cp ./build/generated/mpv.com ./build
- ./build/mpv.com -v --no-config
-fi
-
-if [ "$1" = "waf" ]; then
- ./bootstrap.py
- ./waf configure \
- --out=build_waf \
- --enable-cdda \
- --enable-d3d-hwaccel \
- --enable-d3d11 \
- --enable-dvdnav \
- --enable-egl-angle-lib \
- --enable-egl-angle-win32 \
- --enable-jpeg \
- --enable-lcms2 \
- --enable-libarchive \
- --enable-libbluray \
- --enable-libmpv-shared \
- --enable-libplacebo \
- --enable-pdf-build \
- --enable-rubberband \
- --enable-shaderc \
- --enable-spirv-cross \
- --enable-uchardet \
- --enable-vapoursynth \
- --enable-lua \
- --enable-vulkan
- ./waf build
- ./build_waf/mpv.com -v --no-config
-fi
+python3.11 -m venv venv
+source ./venv/bin/activate
+python -m pip install meson
+meson setup build \
+ -D cdda=enabled \
+ -D d3d-hwaccel=enabled \
+ -D d3d11=enabled \
+ -D dvdnav=enabled \
+ -D egl-angle-lib=enabled \
+ -D egl-angle-win32=enabled \
+ -D jpeg=enabled \
+ -D lcms2=enabled \
+ -D libarchive=enabled \
+ -D libbluray=enabled \
+ -D libmpv=true \
+ -D libplacebo=enabled \
+ -D lua=enabled \
+ -D pdf-build=enabled \
+ -D rubberband=enabled \
+ -D shaderc=enabled \
+ -D spirv-cross=enabled \
+ -D tests=true \
+ -D uchardet=enabled \
+ -D vapoursynth=enabled \
+ -D vulkan=enabled
+meson compile -C build
+cp ./build/generated/mpv.com ./build
+./build/mpv.com -v --no-config
diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh
index 11a13f597c..6dd7f608d7 100755
--- a/ci/build-tumbleweed.sh
+++ b/ci/build-tumbleweed.sh
@@ -1,34 +1,16 @@
#!/bin/sh
set -e
-if [ "$1" = "meson" ]; then
- meson setup build \
- -Dcdda=enabled \
- -Ddvbin=enabled \
- -Ddvdnav=enabled \
- -Dlibarchive=enabled \
- -Dlibmpv=true \
- -Dmanpage-build=enabled \
- -Dpipewire=enabled \
- -Dshaderc=enabled \
- -Dtests=true \
- -Dvulkan=enabled
- meson compile -C build
- ./build/mpv -v --no-config
-fi
-
-if [ "$1" = "waf" ]; then
- python3 ./waf configure \
- --out=build_waf \
- --enable-cdda \
- --enable-dvbin \
- --enable-dvdnav \
- --enable-libarchive \
- --enable-libmpv-shared \
- --enable-manpage-build \
- --enable-pipewire \
- --enable-shaderc \
- --enable-vulkan
- python3 ./waf build
- ./build_waf/mpv -v --no-config
-fi
+meson setup build \
+ -Dcdda=enabled \
+ -Ddvbin=enabled \
+ -Ddvdnav=enabled \
+ -Dlibarchive=enabled \
+ -Dlibmpv=true \
+ -Dmanpage-build=enabled \
+ -Dpipewire=enabled \
+ -Dshaderc=enabled \
+ -Dtests=true \
+ -Dvulkan=enabled
+meson compile -C build
+./build/mpv -v --no-config