Commit cc730535 authored by Barnabás Pőcze's avatar Barnabás Pőcze
Browse files

treewide: meson.build: use feature.allowed()

Since meson 0.59.0, a feature object has an `allowed()`
method which returns true when the feature is set to
'enabled' or 'auto'.

Utilize that instead of the previously used

  not feature.disabled()
parent 15e7a61a
Pipeline #500851 passed with stages
in 5 minutes and 32 seconds
......@@ -19,7 +19,7 @@ manpages = [
'pw-profiler.1.rst.in',
]
if not get_option('pipewire-jack').disabled()
if get_option('pipewire-jack').allowed()
manpages += 'pw-jack.1.rst.in'
endif
......
......@@ -336,7 +336,7 @@ endforeach
gst_dp_found = gst_dep.length() > 0
summary({'gstreamer-device-provider': gst_dp_found}, bool_yn: true, section: 'Backend')
cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', not get_option('gstreamer-device-provider').disabled())
cdata.set('HAVE_GSTREAMER_DEVICE_PROVIDER', get_option('gstreamer-device-provider').allowed())
webrtc_dep = dependency('webrtc-audio-processing',
version : ['>= 0.2', '< 1.0'],
......@@ -382,10 +382,10 @@ cdata.set('HAVE_LILV', lilv_lib.found())
installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name
installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name
installed_tests_enabled = not get_option('installed_tests').disabled()
installed_tests_enabled = get_option('installed_tests').allowed()
installed_tests_template = files('template.test.in')
if not get_option('tests').disabled()
if get_option('tests').allowed()
gstack = find_program('gstack', required : false)
cdata.set('HAVE_GSTACK', gstack.found())
endif
......@@ -394,17 +394,17 @@ subdir('po')
subdir('spa')
subdir('src')
if not get_option('tests').disabled()
if get_option('tests').allowed()
subdir('test')
endif
configure_file(output : 'config.h',
configuration : cdata)
if not get_option('pipewire-jack').disabled()
if get_option('pipewire-jack').allowed()
subdir('pipewire-jack')
endif
if not get_option('pipewire-v4l2').disabled()
if get_option('pipewire-v4l2').allowed()
subdir('pipewire-v4l2')
endif
......@@ -415,7 +415,7 @@ if alsa_dep.found()
endif
generate_manpages = false
if not get_option('man').disabled()
if get_option('man').allowed()
rst2man = find_program('rst2man', required: false)
if not rst2man.found()
rst2man = find_program('rst2man.py', required: get_option('man'))
......
......@@ -31,7 +31,7 @@ pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
subdir('include')
if not get_option('spa-plugins').disabled()
if get_option('spa-plugins').allowed()
udevrulesdir = get_option('udevrulesdir')
if udevrulesdir == ''
# absolute path, otherwise meson prepends the prefix
......@@ -74,6 +74,6 @@ endif
subdir('tools')
subdir('tests')
if not get_option('examples').disabled()
if get_option('examples').allowed()
subdir('examples')
endif
......@@ -6,12 +6,12 @@ foreach dep: bluez5_deps
endforeach
cdata.set('HAVE_BLUEZ_5_BACKEND_NATIVE',
not get_option('bluez5-backend-hsp-native').disabled() or
not get_option('bluez5-backend-hfp-native').disabled())
cdata.set('HAVE_BLUEZ_5_BACKEND_HSP_NATIVE', not get_option('bluez5-backend-hsp-native').disabled())
cdata.set('HAVE_BLUEZ_5_BACKEND_HFP_NATIVE', not get_option('bluez5-backend-hfp-native').disabled())
cdata.set('HAVE_BLUEZ_5_BACKEND_OFONO', not get_option('bluez5-backend-ofono').disabled())
cdata.set('HAVE_BLUEZ_5_BACKEND_HSPHFPD', not get_option('bluez5-backend-hsphfpd').disabled())
get_option('bluez5-backend-hsp-native').allowed() or
get_option('bluez5-backend-hfp-native').allowed())
cdata.set('HAVE_BLUEZ_5_BACKEND_HSP_NATIVE', get_option('bluez5-backend-hsp-native').allowed())
cdata.set('HAVE_BLUEZ_5_BACKEND_HFP_NATIVE', get_option('bluez5-backend-hfp-native').allowed())
cdata.set('HAVE_BLUEZ_5_BACKEND_OFONO', get_option('bluez5-backend-ofono').allowed())
cdata.set('HAVE_BLUEZ_5_BACKEND_HSPHFPD', get_option('bluez5-backend-hsphfpd').allowed())
cdata.set('HAVE_BLUEZ_5_HCI', dependency('bluez', version: '< 6', required: false).found())
bluez5_sources = [
......@@ -34,18 +34,18 @@ bluez5_data = ['bluez-hardware.conf']
install_data(bluez5_data, install_dir : spa_datadir / 'bluez5')
if not get_option('bluez5-backend-hsp-native').disabled() or not get_option('bluez5-backend-hfp-native').disabled()
if get_option('bluez5-backend-hsp-native').allowed() or get_option('bluez5-backend-hfp-native').allowed()
if libusb_dep.found()
bluez5_deps += libusb_dep
endif
bluez5_sources += ['backend-native.c']
endif
if not get_option('bluez5-backend-ofono').disabled()
if get_option('bluez5-backend-ofono').allowed()
bluez5_sources += ['backend-ofono.c']
endif
if not get_option('bluez5-backend-hsphfpd').disabled()
if get_option('bluez5-backend-hsphfpd').allowed()
bluez5_sources += ['backend-hsphfpd.c']
endif
......
if alsa_dep.found()
subdir('alsa')
endif
if not get_option('audioconvert').disabled()
if get_option('audioconvert').allowed()
subdir('audioconvert')
endif
if not get_option('audiomixer').disabled()
if get_option('audiomixer').allowed()
subdir('audiomixer')
endif
if not get_option('control').disabled()
if get_option('control').allowed()
subdir('control')
endif
if not get_option('audiotestsrc').disabled()
if get_option('audiotestsrc').allowed()
subdir('audiotestsrc')
endif
if bluez_dep.found()
......@@ -22,19 +22,19 @@ endif
if jack_dep.found()
subdir('jack')
endif
if not get_option('support').disabled()
if get_option('support').allowed()
subdir('support')
endif
if not get_option('test').disabled()
if get_option('test').allowed()
subdir('test')
endif
if not get_option('videoconvert').disabled()
if get_option('videoconvert').allowed()
subdir('videoconvert')
endif
if not get_option('videotestsrc').disabled()
if get_option('videotestsrc').allowed()
subdir('videotestsrc')
endif
if not get_option('volume').disabled()
if get_option('volume').allowed()
subdir('volume')
endif
if vulkan_headers
......
......@@ -23,7 +23,7 @@ spa_support_lib = shared_library('spa-support',
install_dir : spa_plugindir / 'support')
spa_support_dep = declare_dependency(link_with: spa_support_lib)
if not get_option('evl').disabled()
if get_option('evl').allowed()
evl_inc = include_directories('/usr/evl/include')
evl_lib = cc.find_library('evl',
dirs: ['/usr/evl/lib/'],
......
if not get_option('systemd-system-service').disabled()
if get_option('systemd-system-service').allowed()
subdir('system')
endif
if not get_option('systemd-user-service').disabled()
if get_option('systemd-user-service').allowed()
subdir('user')
endif
......@@ -8,7 +8,7 @@ pipewire_gst_sources = [
'gstpipewiresrc.c',
]
if not get_option('gstreamer-device-provider').disabled()
if get_option('gstreamer-device-provider').allowed()
pipewire_gst_sources += [ 'gstpipewiredeviceprovider.c' ]
endif
......
......@@ -3,10 +3,10 @@ subdir('pipewire')
subdir('daemon')
subdir('tools')
subdir('modules')
if not get_option('examples').disabled()
if get_option('examples').allowed()
subdir('examples')
endif
if not get_option('tests').disabled()
if get_option('tests').allowed()
subdir('tests')
endif
......
......@@ -34,7 +34,7 @@ if ncurses_dep.found()
endif
build_pw_cat = false
if not get_option('pw-cat').disabled() and sndfile_dep.found()
if get_option('pw-cat').allowed() and sndfile_dep.found()
build_pw_cat = true
pwcat_sources = [
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment