meson: remove redundant libplacebo-next check
Now implied by the minimum libplacebo version.
This commit is contained in:
1 parent
e3ae072414
commit
24dca265b4
4 files changed
+5
-14
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
|
||||
+3
-11
@@ -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'],
|
||||
|
||||
@@ -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')
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user