[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] build-sys: meson: Merge system_conf config data from default_conf

[PulseAudio Marge Bot]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
d21d0d89 by Patrick Gaskin at 2021-04-23T01:52:55-04:00
build-sys: meson: Merge system_conf config data from default_conf

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/547>

- - - - -


1 changed file:

- src/daemon/meson.build


Changes:

=====================================
src/daemon/meson.build
=====================================
@@ -121,9 +121,7 @@ custom_target('default.pa',
 )
 
 system_conf = configuration_data()
-system_conf.merge_from(cdata)
-system_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY'))
-system_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
+system_conf.merge_from(default_conf)
 
 system_template_file = configure_file(
   input : 'system.pa.in',



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/d21d0d89a55af491bfc7b9f3a142554a4d7ec8be

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/d21d0d89a55af491bfc7b9f3a142554a4d7ec8be
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20210423/52abe3af/attachment.htm>