mirror of
https://gitlab.freedesktop.org/pipewire/pipewire
synced 2024-10-14 20:02:38 +00:00
meson: use 'auto' as default session manager
Right now, meson -Dsession-managers=wireplumber will fail the build because the default session manager option is set to media-session - and if that isn't being built we error out. Use an 'auto' value instead, selecting the first session-manager in the list as the default one.
This commit is contained in:
parent
86362407c1
commit
05759e3bab
|
@ -207,5 +207,5 @@ option('session-managers',
|
||||||
option('default-session-manager',
|
option('default-session-manager',
|
||||||
description : 'Default session manager (leave as-is if none are built)',
|
description : 'Default session manager (leave as-is if none are built)',
|
||||||
type : 'combo',
|
type : 'combo',
|
||||||
choices : ['media-session', 'wireplumber'],
|
choices : ['auto', 'media-session', 'wireplumber'],
|
||||||
value : 'media-session')
|
value : 'auto')
|
||||||
|
|
|
@ -27,6 +27,15 @@ conf_config_uninstalled.set('comment', '')
|
||||||
build_ms = get_option('session-managers').contains('media-session')
|
build_ms = get_option('session-managers').contains('media-session')
|
||||||
build_wp = get_option('session-managers').contains('wireplumber')
|
build_wp = get_option('session-managers').contains('wireplumber')
|
||||||
sm_choice = get_option('default-session-manager')
|
sm_choice = get_option('default-session-manager')
|
||||||
|
if sm_choice == 'auto'
|
||||||
|
sm_choice = get_option('session-managers').get(0, '')
|
||||||
|
endif
|
||||||
|
|
||||||
|
summary({'Build media-session': build_ms,
|
||||||
|
'Build wireplumber': build_wp,
|
||||||
|
'Default session-manager': sm_choice},
|
||||||
|
section: 'Session managers',
|
||||||
|
bool_yn: true)
|
||||||
|
|
||||||
if sm_choice == 'media-session'
|
if sm_choice == 'media-session'
|
||||||
if get_option('session-managers') == []
|
if get_option('session-managers') == []
|
||||||
|
|
Loading…
Reference in a new issue