From 486bb93dfa90bf948cff8d77ad685f54d0928531 Mon Sep 17 00:00:00 2001 From: llyyr Date: Wed, 25 Oct 2023 19:58:20 +0530 Subject: [PATCH] meson: remove libplacebo wrap This causes more pain than it is worth --- README.md | 9 --------- meson.build | 3 +-- subprojects/libplacebo.wrap | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 subprojects/libplacebo.wrap diff --git a/README.md b/README.md index 11582297e4..4a454d4074 100644 --- a/README.md +++ b/README.md @@ -92,15 +92,6 @@ Example: meson compile -C build meson install -C build -A libplacebo meson wrap is also present for building mpv without having -libplacebo available during build time. When the meson wrap is executed, -libplacebo will be recursively cloned with all its dependencies and statically -linked with mpv. - -Users can also force mpv to fallback to the wrap file: - - meson setup build --force-fallback-for=libplacebo - Essential dependencies (incomplete list): - gcc or clang diff --git a/meson.build b/meson.build index 2ccba61138..a03c6b2db1 100644 --- a/meson.build +++ b/meson.build @@ -23,8 +23,7 @@ libavutil = dependency('libavutil', version: '>= 56.70.100') libswresample = dependency('libswresample', version: '>= 3.9.100') libswscale = dependency('libswscale', version: '>= 5.9.100') -libplacebo = dependency('libplacebo', version: '>=6.338.0', fallback: ['libplacebo', 'libplacebo'], - default_options: ['default_library=static', 'demos=false']) +libplacebo = dependency('libplacebo', version: '>=6.338.0') libass = dependency('libass', version: '>= 0.12.2') diff --git a/subprojects/libplacebo.wrap b/subprojects/libplacebo.wrap deleted file mode 100644 index d117e2f53e..0000000000 --- a/subprojects/libplacebo.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-git] - -url = https://code.videolan.org/videolan/libplacebo.git -revision = v6.338.1 -depth = 1 -clone-recursive = true