mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	src/daemon: move the optional drop-ins to conf.avail
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>
This commit is contained in:
		
							parent
							
								
									6c0434ec9c
								
							
						
					
					
						commit
						265f7dd09f
					
				
					 10 changed files with 10 additions and 10 deletions
				
			
		| 
						 | 
					@ -6,6 +6,6 @@ foreach c : conf_files
 | 
				
			||||||
  configure_file(input : '@0@.in'.format(c),
 | 
					  configure_file(input : '@0@.in'.format(c),
 | 
				
			||||||
                 output : c,
 | 
					                 output : c,
 | 
				
			||||||
                 configuration : conf_config,
 | 
					                 configuration : conf_config,
 | 
				
			||||||
                 install_dir : pipewire_confdatadir / 'client-rt.conf.d')
 | 
					                 install_dir : pipewire_confdatadir / 'client-rt.conf.avail')
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,6 +6,6 @@ foreach c : conf_files
 | 
				
			||||||
  configure_file(input : '@0@.in'.format(c),
 | 
					  configure_file(input : '@0@.in'.format(c),
 | 
				
			||||||
                 output : c,
 | 
					                 output : c,
 | 
				
			||||||
                 configuration : conf_config,
 | 
					                 configuration : conf_config,
 | 
				
			||||||
                 install_dir : pipewire_confdatadir / 'client.conf.d')
 | 
					                 install_dir : pipewire_confdatadir / 'client.conf.avail')
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -86,14 +86,14 @@ configure_file(input : 'pipewire.conf.in',
 | 
				
			||||||
               output : 'pipewire-uninstalled.conf',
 | 
					               output : 'pipewire-uninstalled.conf',
 | 
				
			||||||
               configuration : conf_config_uninstalled)
 | 
					               configuration : conf_config_uninstalled)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
conf_d_files = [
 | 
					conf_avail_folders = [
 | 
				
			||||||
  'pipewire.conf.d',
 | 
					  'pipewire.conf.avail',
 | 
				
			||||||
  'client.conf.d',
 | 
					  'client.conf.avail',
 | 
				
			||||||
  'client-rt.conf.d',
 | 
					  'client-rt.conf.avail',
 | 
				
			||||||
  'pipewire-pulse.conf.d',
 | 
					  'pipewire-pulse.conf.avail',
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
foreach c : conf_d_files
 | 
					foreach c : conf_avail_folders
 | 
				
			||||||
  subdir(c)
 | 
					  subdir(c)
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,6 +6,6 @@ foreach c : conf_files
 | 
				
			||||||
  configure_file(input : '@0@.in'.format(c),
 | 
					  configure_file(input : '@0@.in'.format(c),
 | 
				
			||||||
                 output : c,
 | 
					                 output : c,
 | 
				
			||||||
                 configuration : conf_config,
 | 
					                 configuration : conf_config,
 | 
				
			||||||
                 install_dir : pipewire_confdatadir / 'pipewire-pulse.conf.d')
 | 
					                 install_dir : pipewire_confdatadir / 'pipewire-pulse.conf.avail')
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,6 +7,6 @@ foreach c : conf_files
 | 
				
			||||||
  configure_file(input : '@0@.in'.format(c),
 | 
					  configure_file(input : '@0@.in'.format(c),
 | 
				
			||||||
                 output : c,
 | 
					                 output : c,
 | 
				
			||||||
                 configuration : conf_config,
 | 
					                 configuration : conf_config,
 | 
				
			||||||
                 install_dir : pipewire_confdatadir / 'pipewire.conf.d')
 | 
					                 install_dir : pipewire_confdatadir / 'pipewire.conf.avail')
 | 
				
			||||||
endforeach
 | 
					endforeach
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue