mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-10-29 05:40:23 -04:00 
			
		
		
		
	build-sys: Fix running on macOS
Ensure modules are built as .so files so that they are found by ltdl at runtime. Fix HAVE_COREAUDIO not being set on macOS leading to sound not working in the default configuration. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/3808 Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/817>
This commit is contained in:
		
							parent
							
								
									6c77b0191a
								
							
						
					
					
						commit
						c1990dd026
					
				
					 2 changed files with 8 additions and 2 deletions
				
			
		|  | @ -152,8 +152,6 @@ cdata.set_quoted('PA_SRCDIR', join_paths(meson.current_source_dir(), 'src')) | ||||||
| cdata.set_quoted('PA_BUILDDIR', meson.current_build_dir()) | cdata.set_quoted('PA_BUILDDIR', meson.current_build_dir()) | ||||||
| if host_machine.system() == 'windows' | if host_machine.system() == 'windows' | ||||||
|   cdata.set_quoted('PA_SOEXT', '.dll') |   cdata.set_quoted('PA_SOEXT', '.dll') | ||||||
| elif host_machine.system() == 'darwin' |  | ||||||
|   cdata.set_quoted('PA_SOEXT', '.dylib') |  | ||||||
| else | else | ||||||
|   cdata.set_quoted('PA_SOEXT', '.so') |   cdata.set_quoted('PA_SOEXT', '.so') | ||||||
| endif | endif | ||||||
|  | @ -192,6 +190,7 @@ endif | ||||||
| # rather than ending up in the config.h file? | # rather than ending up in the config.h file? | ||||||
| if host_machine.system() == 'darwin' | if host_machine.system() == 'darwin' | ||||||
|   cdata.set('OS_IS_DARWIN', 1) |   cdata.set('OS_IS_DARWIN', 1) | ||||||
|  |   cdata.set('HAVE_COREAUDIO', 1) | ||||||
|   cdata.set('_DARWIN_C_SOURCE', '200112L') # Needed to get NSIG on Mac OS |   cdata.set('_DARWIN_C_SOURCE', '200112L') # Needed to get NSIG on Mac OS | ||||||
| elif host_machine.system() == 'windows' | elif host_machine.system() == 'windows' | ||||||
|   cdata.set('OS_IS_WIN32', 1) |   cdata.set('OS_IS_WIN32', 1) | ||||||
|  |  | ||||||
|  | @ -311,6 +311,12 @@ else | ||||||
|   no_undefined_args = [] |   no_undefined_args = [] | ||||||
| endif | endif | ||||||
| 
 | 
 | ||||||
|  | module_suffix = [] | ||||||
|  | if host_machine.system() == 'darwin' | ||||||
|  |   # meson defaults to dylib but ltdl expects so | ||||||
|  |   module_suffix = 'so' | ||||||
|  | endif | ||||||
|  | 
 | ||||||
| foreach m : all_modules | foreach m : all_modules | ||||||
|   name = m[0] |   name = m[0] | ||||||
|   sources = m[1] |   sources = m[1] | ||||||
|  | @ -331,5 +337,6 @@ foreach m : all_modules | ||||||
|     link_args : [nodelete_link_args, no_undefined_args], |     link_args : [nodelete_link_args, no_undefined_args], | ||||||
|     link_with : extra_libs, |     link_with : extra_libs, | ||||||
|     name_prefix : '', |     name_prefix : '', | ||||||
|  |     name_suffix : module_suffix, | ||||||
|     implicit_include_directories : false) |     implicit_include_directories : false) | ||||||
| endforeach | endforeach | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Mohamed Akram
						Mohamed Akram