@@ -, +, @@ build-sys: meson: add oss-output option for OSS output support Restore an option to disable OSS output available with autotools. --- a/meson.build +++ a/meson.build @@ -613,8 +613,8 @@ if x11_dep.found() endif # Module dependencies - -if cc.has_header('sys/soundcard.h') +if get_option('oss-output') + assert(cc.has_header('sys/soundcard.h'), 'Need header file for OSS support') cdata.set('HAVE_OSS_OUTPUT', 1) cdata.set('HAVE_OSS_WRAPPER', 1) cdata.set('PULSEDSP_LOCATION', pulsedsp_location) @@ -808,7 +808,7 @@ summary = [ '', 'Enable memfd shared memory: @0@'.format(cdata.has('HAVE_MEMFD')), 'Enable X11: @0@'.format(x11_dep.found()), -# 'Enable OSS Output: @0@'.format(${ENABLE_OSS_OUTPUT}), + 'Enable OSS Output: @0@'.format(get_option('oss-output')), # 'Enable OSS Wrapper: @0@'.format(${ENABLE_OSS_WRAPPER}), # 'Enable EsounD: @0@'.format(${ENABLE_ESOUND}), 'Enable Alsa: @0@'.format(alsa_dep.found()), --- a/meson_options.txt +++ a/meson_options.txt @@ -123,6 +123,9 @@ option('openssl', option('orc', type : 'feature', value : 'auto', description : 'Optimized Inner Loop Runtime Compiler') +option('oss-output', + type : 'boolean', + description : 'Optional OSS output support') option('samplerate', type : 'feature', value : 'disabled', description : 'Optional libsamplerate support (DEPRECATED)') --- a/src/modules/meson.build +++ a/src/modules/meson.build @@ -73,7 +73,7 @@ if cc.has_header('linux/input.h') ] endif -if cc.has_header('sys/soundcard.h') +if get_option('oss-output') subdir('oss') all_modules += [ [ 'module-oss', 'oss/module-oss.c', [], [], [], liboss_util ], --- a/src/utils/meson.build +++ a/src/utils/meson.build @@ -84,7 +84,7 @@ if x11_dep.found() ) endif -if cc.has_header('sys/soundcard.h') +if get_option('oss-output') libpulsecommon_sources = [ 'padsp.c', ]