mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: meson: add oss-output option for OSS output support

Browse source 
Restore an option to disable OSS output available with autotools.
This commit is contained in:
Igor V. Kovalenko 2020-11-27 23:49:17 +03:00
parent 1e7adb4fdb
commit ecd597995a
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -613,8 +613,8 @@ if x11_dep.found()
endif endif
# Module dependencies # Module dependencies
if get_option('oss-output')
if cc.has_header('sys/soundcard.h') assert(cc.has_header('sys/soundcard.h'), 'Need header file for OSS support')
cdata.set('HAVE_OSS_OUTPUT', 1) cdata.set('HAVE_OSS_OUTPUT', 1)
cdata.set('HAVE_OSS_WRAPPER', 1) cdata.set('HAVE_OSS_WRAPPER', 1)
cdata.set('PULSEDSP_LOCATION', pulsedsp_location) cdata.set('PULSEDSP_LOCATION', pulsedsp_location)
@ -808,7 +808,7 @@ summary = [
'', '',
'Enable memfd shared memory: @0@'.format(cdata.has('HAVE_MEMFD')), 'Enable memfd shared memory: @0@'.format(cdata.has('HAVE_MEMFD')),
'Enable X11: @0@'.format(x11_dep.found()), '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 OSS Wrapper: @0@'.format(${ENABLE_OSS_WRAPPER}),
# 'Enable EsounD: @0@'.format(${ENABLE_ESOUND}), # 'Enable EsounD: @0@'.format(${ENABLE_ESOUND}),
'Enable Alsa: @0@'.format(alsa_dep.found()), 'Enable Alsa: @0@'.format(alsa_dep.found()),

3
meson_options.txt
View file

@ -123,6 +123,9 @@ option('openssl',
option('orc', option('orc',
type : 'feature', value : 'auto', type : 'feature', value : 'auto',
description : 'Optimized Inner Loop Runtime Compiler') description : 'Optimized Inner Loop Runtime Compiler')
option('oss-output',
type : 'boolean',
description : 'Optional OSS output support')
option('samplerate', option('samplerate',
type : 'feature', value : 'disabled', type : 'feature', value : 'disabled',
description : 'Optional libsamplerate support (DEPRECATED)') description : 'Optional libsamplerate support (DEPRECATED)')

2
src/modules/meson.build
View file

@ -73,7 +73,7 @@ if cc.has_header('linux/input.h')
] ]
endif endif
if cc.has_header('sys/soundcard.h') if get_option('oss-output')
subdir('oss') subdir('oss')
all_modules += [ all_modules += [
[ 'module-oss', 'oss/module-oss.c', [], [], [], liboss_util ], [ 'module-oss', 'oss/module-oss.c', [], [], [], liboss_util ],

2
src/utils/meson.build
View file

@ -84,7 +84,7 @@ if x11_dep.found()
) )
endif endif
if cc.has_header('sys/soundcard.h') if get_option('oss-output')
libpulsecommon_sources = [ libpulsecommon_sources = [
'padsp.c', 'padsp.c',
] ]