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

meson: changes meson switches for controlling session manager

Browse source 
Some distributions set --auto_features=enabled which messes with the
internal logic of the build system when features are used for other
purposes than pure dependency control. The only solution is to either
avoid the value auto or change the type of the option to non-feature.

This commit does the later by replacing -Dmedia-session, -Dwireplumber
and -Dsession-manager with the new -Dsession-managers array and
-Ddefault-session-manager combo options.

Fixes #1333
Fixes #1336
This commit is contained in:
Niklāvs Koļesņikovs 2021-06-24 16:54:36 +03:00 • committed by Wim Taymans
parent 016f02616b
commit d7cddbdb61
6 changed files with 35 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

17
meson_options.txt
View file

@ -199,16 +199,13 @@ option('libusb',
description: 'Enable code that depends on libusb',
type: 'feature',
value: 'auto')
option('media-session',
description: 'Build and install pipewire-media-session',
type: 'feature',
value: 'enabled')
option('wireplumber',
description: 'Build and install wireplumber (subproject)',
type: 'feature',
value: 'auto')
option('session-manager',
description : 'Session manager to build and use in the uninstalled environment',
option('session-managers',
description : 'Session managers to build (can be [] for none)',
type : 'array',
choices : ['media-session', 'wireplumber'],
value : ['media-session'])
option('default-session-manager',
description : 'Default session manager (leave as-is if none are built)',
type : 'combo',
choices : ['media-session', 'wireplumber'],
value : 'media-session')