diff options
| author | Niklas Haas <git@haasn.dev> | 2023-07-17 15:59:05 +0200 |
|---|---|---|
| committer | Niklas Haas <github-daiK1o@haasn.dev> | 2023-08-18 16:39:57 +0200 |
| commit | 24dca265b45fc07e0bb193ea87e36931ce459f7d (patch) | |
| tree | 18a15e2c20402dbb309918dd479b1d47e6e7a077 | |
| parent | e3ae0724140f8c333670ac7a08cac865dcb9a576 (diff) | |
| download | mpv-24dca265b45fc07e0bb193ea87e36931ce459f7d.tar.bz2 mpv-24dca265b45fc07e0bb193ea87e36931ce459f7d.tar.xz | |
meson: remove redundant libplacebo-next check
Now implied by the minimum libplacebo version.
| -rwxr-xr-x | ci/build-mingw64.sh | 2 | ||||
| -rw-r--r-- | meson.build | 14 | ||||
| -rw-r--r-- | meson_options.txt | 1 | ||||
| -rw-r--r-- | video/out/vo.c | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index f20c65b4fa..2585382d4f 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -204,7 +204,7 @@ rm -rf build meson setup build --cross-file "$prefix_dir/crossfile" \ --buildtype debugoptimized \ -Dlibmpv=true -Dlua=luajit \ - -D{shaderc,spirv-cross,d3d11,libplacebo,libplacebo-next}=enabled + -D{shaderc,spirv-cross,d3d11,libplacebo}=enabled meson compile -C build diff --git a/meson.build b/meson.build index 8a7d7d2b0e..7eb6f95cb2 100644 --- a/meson.build +++ b/meson.build @@ -934,16 +934,8 @@ features += {'libplacebo': libplacebo.found()} if features['libplacebo'] dependencies += libplacebo sources += files('video/out/placebo/ra_pl.c', - 'video/out/placebo/utils.c') -endif - -libplacebo_next = get_option('libplacebo-next').require( - features['libplacebo'] and libplacebo.version().version_compare('>=5.264.0'), - error_message: 'libplacebo v5.264.0+ was not found!', -) -features += {'libplacebo-next': libplacebo_next.allowed()} -if features['libplacebo-next'] - sources += files('video/out/vo_gpu_next.c', + 'video/out/placebo/utils.c', + 'video/out/vo_gpu_next.c', 'video/out/gpu_next/context.c') endif @@ -1779,7 +1771,7 @@ if get_option('tests') endif summary({'d3d11': features['d3d11'], - 'gpu-next': features['libplacebo-next'], + 'gpu-next': features['libplacebo'], 'javascript': features['javascript'], 'libmpv': get_option('libmpv'), 'lua': features['lua'], diff --git a/meson_options.txt b/meson_options.txt index 22d7cebd71..3e6c8ef929 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -76,7 +76,6 @@ option('gl-win32', type: 'feature', value: 'auto', description: 'OpenGL Win32 Ba option('gl-x11', type: 'feature', value: 'disabled', description: 'OpenGL X11/GLX (deprecated/legacy)') option('jpeg', type: 'feature', value: 'auto', description: 'JPEG support') option('libplacebo', type: 'feature', value: 'auto', description: 'libplacebo support') -option('libplacebo-next', type: 'feature', value: 'auto', description: 'gpu-next video output') option('rpi', type: 'feature', value: 'disabled', description: 'Raspberry Pi support') option('sdl2-video', type: 'feature', value: 'auto', description: 'SDL2 video output') option('shaderc', type: 'feature', value: 'auto', description: 'libshaderc SPIR-V compiler') diff --git a/video/out/vo.c b/video/out/vo.c index 4b05e6042e..d301083696 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -76,7 +76,7 @@ static const struct vo_driver *const video_out_drivers[] = &video_out_mediacodec_embed, #endif &video_out_gpu, -#if HAVE_LIBPLACEBO_NEXT +#if HAVE_LIBPLACEBO &video_out_gpu_next, #endif #if HAVE_VDPAU |