mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-25 06:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start media-session and pulse-server in uninstalled config

Browse source 
Also update the INSTALL instructions to match reality.
This commit is contained in:
Wim Taymans 2021-02-25 07:00:56 +01:00
parent eacda22a7b
commit 7cf07da392
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/meson.build
View file

@ -13,6 +13,7 @@ conf_config.set('VERSION', '"@0@"'.format(pipewire_version))
conf_config.set('media_session_path', join_paths(pipewire_bindir, 'pipewire-media-session'))
conf_config.set('pipewire_path', join_paths(pipewire_bindir, 'pipewire'))
conf_config.set('pipewire_pulse_path', join_paths(pipewire_bindir, 'pipewire-pulse'))
conf_config.set('comment', '#')
conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
conf_config_uninstalled = conf_config
@ -22,6 +23,7 @@ conf_config_uninstalled.set('pipewire_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire'))
conf_config_uninstalled.set('pipewire_pulse_path',
join_paths(meson.build_root(), 'src', 'daemon', 'pipewire-pulse'))
conf_config_uninstalled.set('comment', '')
conf_files = [

4
src/daemon/pipewire.conf.in
View file

@ -203,12 +203,12 @@ context.exec = {
# but it is better to start it as a systemd service.
# Run the session manager with -h for options.
#
#"@media_session_path@" = { args = "" }
@comment@"@media_session_path@" = { args = "" }
#
# You can optionally start the pulseaudio-server here as well
# but it is better to start it as a systemd service.
# It can be interesting to start another daemon here that listens
# on another address with the -a option (eg. -a tcp:4713).
#
#"@pipewire_path@" = { args = "-c pipewire-pulse.conf" }
@comment@"@pipewire_path@" = { args = "-c pipewire-pulse.conf" }
}