meson: remove redundant sdl2 option

This disables the individual options by default, since they were gated by the parent option before.
This commit is contained in:
sfan5 authored and Kacper Michajłow committed 2025-10-31 12:53:04 +01:00
1 parent 454d9eb361
commit 8649b64e57
2 files changed
+10 -12

No files matched your search

+7 -8
View File
@@ -739,19 +739,16 @@ if features['rubberband']
sources += files('audio/filter/af_rubberband.c')
endif
sdl2 = dependency('sdl2', required: get_option('sdl2'))
features += {'sdl2': sdl2.found()}
if features['sdl2']
dependencies += sdl2
endif
sdl2 = dependency('sdl2', required: false)
sdl2_gamepad = get_option('sdl2-gamepad').require(
features['sdl2'],
sdl2.found(),
error_message: 'sdl2 was not found!',
)
features += {'sdl2-gamepad': sdl2_gamepad.allowed()}
if features['sdl2-gamepad']
sources += files('input/sdl_gamepad.c')
dependencies += sdl2
endif
uchardet_opt = get_option('uchardet').require(
@@ -895,12 +892,13 @@ if features['pulse']
endif
sdl2_audio = get_option('sdl2-audio').require(
features['sdl2'],
sdl2.found(),
error_message: 'sdl2 was not found!',
)
features += {'sdl2-audio': sdl2_audio.allowed()}
if features['sdl2-audio']
sources += files('audio/out/ao_sdl.c')
dependencies += sdl2
endif
sndio = dependency('sndio', required: get_option('sndio'))
@@ -975,12 +973,13 @@ if features['jpeg']
endif
sdl2_video = get_option('sdl2-video').require(
features['sdl2'],
sdl2.found(),
error_message: 'sdl2 was not found!',
)
features += {'sdl2-video': sdl2_video.allowed()}
if features['sdl2-video']
sources += files('video/out/vo_sdl.c')
dependencies += sdl2
endif
shaderc = dependency('shaderc', required:
+3 -4
View File
@@ -28,8 +28,7 @@ option('lua',
)
option('pthread-debug', type: 'feature', value: 'disabled', description: 'pthread runtime debugging wrappers')
option('rubberband', type: 'feature', value: 'auto', description: 'librubberband support')
option('sdl2', type: 'feature', value: 'disabled', description: 'SDL2')
option('sdl2-gamepad', type: 'feature', value: 'auto', description: 'SDL2 gamepad input')
option('sdl2-gamepad', type: 'feature', value: 'disabled', description: 'SDL2 gamepad input')
option('uchardet', type: 'feature', value: 'auto', description: 'uchardet support')
option('uwp', type: 'feature', value: 'disabled', description: 'Universal Windows Platform')
option('vapoursynth', type: 'feature', value: 'auto', description: 'VapourSynth filter bridge')
@@ -50,7 +49,7 @@ option('opensles', type: 'feature', value: 'auto', description: 'OpenSL ES audio
option('oss-audio', type: 'feature', value: 'auto', description: 'OSSv4 audio output')
option('pipewire', type: 'feature', value: 'auto', description: 'PipeWire audio output')
option('pulse', type: 'feature', value: 'auto', description: 'PulseAudio audio output')
option('sdl2-audio', type: 'feature', value: 'auto', description: 'SDL2 audio output')
option('sdl2-audio', type: 'feature', value: 'disabled', description: 'SDL2 audio output')
option('sndio', type: 'feature', value: 'auto', description: 'sndio audio output')
option('wasapi', type: 'feature', value: 'auto', description: 'WASAPI audio output')
@@ -75,7 +74,7 @@ option('gl-cocoa', type: 'feature', value: 'auto', description: 'OpenGL Cocoa ba
option('gl-dxinterop', type: 'feature', value: 'auto', description: 'OpenGL/DirectX Interop backend')
option('gl-win32', type: 'feature', value: 'auto', description: 'OpenGL Win32 backend')
option('gl-x11', type: 'feature', value: 'disabled', description: 'OpenGL X11/GLX (deprecated/legacy)')
option('sdl2-video', type: 'feature', value: 'auto', description: 'SDL2 video output')
option('sdl2-video', type: 'feature', value: 'disabled', description: 'SDL2 video output')
option('shaderc', type: 'feature', value: 'auto', description: 'libshaderc SPIR-V compiler')
option('sixel', type: 'feature', value:'auto', description: 'Sixel video output')
option('spirv-cross', type: 'feature', value: 'auto', description: 'SPIRV-Cross SPIR-V shader converter')