diff options
| author | llyyr <llyyr.public@gmail.com> | 2023-09-20 02:50:26 +0530 |
|---|---|---|
| committer | Niklas Haas <github-daiK1o@haasn.dev> | 2023-10-23 13:03:29 +0200 |
| commit | f5ca11e12bc55d14bd6895b619c4abfd470c6452 (patch) | |
| tree | 6ac7c720f50e54ba5940282cee4b793a3dee0f22 /ci | |
| parent | 59a3c453f97c558b80ba4a39a8e5b476a66c5951 (diff) | |
| download | mpv-f5ca11e12bc55d14bd6895b619c4abfd470c6452.tar.bz2 mpv-f5ca11e12bc55d14bd6895b619c4abfd470c6452.tar.xz | |
meson: make libplacebo a required dependency
Make it not possible to build mpv without the latest libplacebo anymore.
This will allow for less code duplication between mpv and libplacebo,
and in the future also let us delete legacy ifdefs and track libplacebo
better.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-macos.sh | 2 | ||||
| -rwxr-xr-x | ci/build-mingw64.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 19288578a6..14b3a1b934 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -14,7 +14,7 @@ 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,libplacebo,lua,jpeg,plain-gl,zlib}=enabled \ + -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 diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index 259ba86c5a..57068c1c9b 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -272,7 +272,7 @@ meson setup $build --cross-file "$prefix_dir/crossfile" \ -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \ --buildtype debugoptimized \ -Dlibmpv=true -Dlua=luajit \ - -D{shaderc,spirv-cross,d3d11,libplacebo}=enabled + -D{shaderc,spirv-cross,d3d11}=enabled meson compile -C $build |