mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Fixed remaining issues from the port to feature options

Browse source
This commit is contained in:
Thibault Saunier 2021-03-11 14:25:48 -03:00 • committed by Wim Taymans
parent 9cd9339c2a
commit 22f6e8e36d
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
meson_options.txt
View file

@ -38,7 +38,7 @@ option('systemd',
option('systemd-system-service', option('systemd-system-service',
description: 'Install systemd system service file', description: 'Install systemd system service file',
type: 'feature', type: 'feature',
value: 'auto') value: 'disabled')
option('systemd-user-service', option('systemd-user-service',
description: 'Install systemd user service file', description: 'Install systemd user service file',
type: 'feature', type: 'feature',
@ -124,8 +124,8 @@ option('v4l2',
value: 'auto') value: 'auto')
option('libcamera', option('libcamera',
description: 'Enable libcamera spa plugin integration', description: 'Enable libcamera spa plugin integration',
type: 'boolean', type: 'feature',
value: false) value: 'auto')
option('videoconvert', option('videoconvert',
description: 'Enable videoconvert spa plugin integration', description: 'Enable videoconvert spa plugin integration',
type: 'feature', type: 'feature',

4
src/examples/meson.build
View file

@ -65,7 +65,7 @@ executable('export-spa-device',
dependencies : [pipewire_dep, mathlib], dependencies : [pipewire_dep, mathlib],
) )
if alsa_dep.found() if not get_option('media-session').disabled() and alsa_dep.found()
executable('pipewire-media-session', executable('pipewire-media-session',
'media-session/access-flatpak.c', 'media-session/access-flatpak.c',
'media-session/access-portal.c', 'media-session/access-portal.c',
@ -94,8 +94,6 @@ if alsa_dep.found()
install: true, install: true,
dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib], dependencies : [dbus_dep, pipewire_dep, alsa_dep, mathlib],
) )
elif get_option('media-session').enabled() and not alsa_dep.found()
error('`media-session` is enabled but required dependency `alsa` not found.')
endif endif
executable('pw-reserve', executable('pw-reserve',

4
src/meson.build
View file

@ -11,4 +11,6 @@ if not get_option('tests').disabled()
subdir('tests') subdir('tests')
endif endif
subdir('gst') if gst_dep.length() != 0
subdir('gst')
endif