From 265f7dd09f45c3cd395e3d744fc3d01e5d23df89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikl=C4=81vs=20Ko=C4=BCes=C5=86ikovs?= <89q1r14hd@relay.firefox.com> Date: Fri, 24 Mar 2023 22:13:34 +0200 Subject: [PATCH] src/daemon: move the optional drop-ins to conf.avail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These drop-ins are not meant to be enabled by default, so let's move them to fontconfig style *.conf.avail/ subfolders from which they can be copied or symlinked to a location that will get merged into the corresponding configuration file. Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd@relay.firefox.com> --- .../20-upmix.conf.in | 0 .../meson.build | 2 +- .../20-upmix.conf.in | 0 .../{client.conf.d => client.conf.avail}/meson.build | 2 +- src/daemon/meson.build | 12 ++++++------ .../20-upmix.conf.in | 0 .../meson.build | 2 +- .../10-rates.conf.in | 0 .../20-upmix.conf.in | 0 .../meson.build | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename src/daemon/{client-rt.conf.d => client-rt.conf.avail}/20-upmix.conf.in (100%) rename src/daemon/{client-rt.conf.d => client-rt.conf.avail}/meson.build (94%) rename src/daemon/{client.conf.d => client.conf.avail}/20-upmix.conf.in (100%) rename src/daemon/{client.conf.d => client.conf.avail}/meson.build (95%) rename src/daemon/{pipewire-pulse.conf.d => pipewire-pulse.conf.avail}/20-upmix.conf.in (100%) rename src/daemon/{pipewire-pulse.conf.d => pipewire-pulse.conf.avail}/meson.build (93%) rename src/daemon/{pipewire.conf.d => pipewire.conf.avail}/10-rates.conf.in (100%) rename src/daemon/{pipewire.conf.d => pipewire.conf.avail}/20-upmix.conf.in (100%) rename src/daemon/{pipewire.conf.d => pipewire.conf.avail}/meson.build (95%) diff --git a/src/daemon/client-rt.conf.d/20-upmix.conf.in b/src/daemon/client-rt.conf.avail/20-upmix.conf.in similarity index 100% rename from src/daemon/client-rt.conf.d/20-upmix.conf.in rename to src/daemon/client-rt.conf.avail/20-upmix.conf.in diff --git a/src/daemon/client-rt.conf.d/meson.build b/src/daemon/client-rt.conf.avail/meson.build similarity index 94% rename from src/daemon/client-rt.conf.d/meson.build rename to src/daemon/client-rt.conf.avail/meson.build index ac0dc3066..4b3edfdad 100644 --- a/src/daemon/client-rt.conf.d/meson.build +++ b/src/daemon/client-rt.conf.avail/meson.build @@ -6,6 +6,6 @@ foreach c : conf_files configure_file(input : '@0@.in'.format(c), output : c, configuration : conf_config, - install_dir : pipewire_confdatadir / 'client-rt.conf.d') + install_dir : pipewire_confdatadir / 'client-rt.conf.avail') endforeach diff --git a/src/daemon/client.conf.d/20-upmix.conf.in b/src/daemon/client.conf.avail/20-upmix.conf.in similarity index 100% rename from src/daemon/client.conf.d/20-upmix.conf.in rename to src/daemon/client.conf.avail/20-upmix.conf.in diff --git a/src/daemon/client.conf.d/meson.build b/src/daemon/client.conf.avail/meson.build similarity index 95% rename from src/daemon/client.conf.d/meson.build rename to src/daemon/client.conf.avail/meson.build index ad2340455..0bdd9420a 100644 --- a/src/daemon/client.conf.d/meson.build +++ b/src/daemon/client.conf.avail/meson.build @@ -6,6 +6,6 @@ foreach c : conf_files configure_file(input : '@0@.in'.format(c), output : c, configuration : conf_config, - install_dir : pipewire_confdatadir / 'client.conf.d') + install_dir : pipewire_confdatadir / 'client.conf.avail') endforeach diff --git a/src/daemon/meson.build b/src/daemon/meson.build index d2b213115..0610d7323 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -86,14 +86,14 @@ configure_file(input : 'pipewire.conf.in', output : 'pipewire-uninstalled.conf', configuration : conf_config_uninstalled) -conf_d_files = [ - 'pipewire.conf.d', - 'client.conf.d', - 'client-rt.conf.d', - 'pipewire-pulse.conf.d', +conf_avail_folders = [ + 'pipewire.conf.avail', + 'client.conf.avail', + 'client-rt.conf.avail', + 'pipewire-pulse.conf.avail', ] -foreach c : conf_d_files +foreach c : conf_avail_folders subdir(c) endforeach diff --git a/src/daemon/pipewire-pulse.conf.d/20-upmix.conf.in b/src/daemon/pipewire-pulse.conf.avail/20-upmix.conf.in similarity index 100% rename from src/daemon/pipewire-pulse.conf.d/20-upmix.conf.in rename to src/daemon/pipewire-pulse.conf.avail/20-upmix.conf.in diff --git a/src/daemon/pipewire-pulse.conf.d/meson.build b/src/daemon/pipewire-pulse.conf.avail/meson.build similarity index 93% rename from src/daemon/pipewire-pulse.conf.d/meson.build rename to src/daemon/pipewire-pulse.conf.avail/meson.build index 647409dbd..11536350d 100644 --- a/src/daemon/pipewire-pulse.conf.d/meson.build +++ b/src/daemon/pipewire-pulse.conf.avail/meson.build @@ -6,6 +6,6 @@ foreach c : conf_files configure_file(input : '@0@.in'.format(c), output : c, configuration : conf_config, - install_dir : pipewire_confdatadir / 'pipewire-pulse.conf.d') + install_dir : pipewire_confdatadir / 'pipewire-pulse.conf.avail') endforeach diff --git a/src/daemon/pipewire.conf.d/10-rates.conf.in b/src/daemon/pipewire.conf.avail/10-rates.conf.in similarity index 100% rename from src/daemon/pipewire.conf.d/10-rates.conf.in rename to src/daemon/pipewire.conf.avail/10-rates.conf.in diff --git a/src/daemon/pipewire.conf.d/20-upmix.conf.in b/src/daemon/pipewire.conf.avail/20-upmix.conf.in similarity index 100% rename from src/daemon/pipewire.conf.d/20-upmix.conf.in rename to src/daemon/pipewire.conf.avail/20-upmix.conf.in diff --git a/src/daemon/pipewire.conf.d/meson.build b/src/daemon/pipewire.conf.avail/meson.build similarity index 95% rename from src/daemon/pipewire.conf.d/meson.build rename to src/daemon/pipewire.conf.avail/meson.build index d939190df..8650314ce 100644 --- a/src/daemon/pipewire.conf.d/meson.build +++ b/src/daemon/pipewire.conf.avail/meson.build @@ -7,6 +7,6 @@ foreach c : conf_files configure_file(input : '@0@.in'.format(c), output : c, configuration : conf_config, - install_dir : pipewire_confdatadir / 'pipewire.conf.d') + install_dir : pipewire_confdatadir / 'pipewire.conf.avail') endforeach