[patch] accompanying patch for meson build to restore optional processing of OSS output for 'oss' use flag

pulseaudio-v14.0-meson-oss-output-option.patch (text/plain), 2.45 KB, created by Igor V. Kovalenko on 2020-11-28 10:56:08 UTC

commit ecd597995a587705752796e3b8e229430ee6e847
Author: Igor V. Kovalenko <[e-mail]>
Date:   Fri Nov 27 23:49:17 2020 +0300

    build-sys: meson: add oss-output option for OSS output support
    
    Restore an option to disable OSS output available with autotools.

diff --git a/meson.build b/meson.build
index 217ba0d85..4dae29808 100644
--- a/meson.build
+++ b/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()),
diff --git a/meson_options.txt b/meson_options.txt
index 824f24e08..5283a6d98 100644
--- a/meson_options.txt
+++ b/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)')
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 9a394c3b9..9df6d0e61 100644
--- a/src/modules/meson.build
+++ b/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 ],
diff --git a/src/utils/meson.build b/src/utils/meson.build
index dedf4e404..934abb850 100644
--- a/src/utils/meson.build
+++ b/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',
   ]