mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-10-29 05:40:27 -04:00 
			
		
		
		
	spa: fix indentation in audioconvert/meson.build
Was partially using spaces, partially 2-space tabs. Use 2 spaces only and fix the few lines where the indentation was completely out of whack.
This commit is contained in:
		
							parent
							
								
									b2206e2530
								
							
						
					
					
						commit
						e38cc427bf
					
				
					 1 changed files with 146 additions and 148 deletions
				
			
		|  | @ -1,196 +1,194 @@ | |||
| audioconvert_sources = ['audioadapter.c', | ||||
| 			'audioconvert.c', | ||||
| 			'fmtconvert.c', | ||||
| 			'channelmix.c', | ||||
| 			'merger.c', | ||||
| 			'plugin.c', | ||||
| 			'resample.c', | ||||
| 			'splitter.c'] | ||||
|   'audioconvert.c', | ||||
|   'fmtconvert.c', | ||||
|   'channelmix.c', | ||||
|   'merger.c', | ||||
|   'plugin.c', | ||||
|   'resample.c', | ||||
|   'splitter.c'] | ||||
| 
 | ||||
| simd_cargs = [] | ||||
| simd_dependencies = [] | ||||
| 
 | ||||
| if have_sse | ||||
| 	audioconvert_sse = static_library('audioconvert_sse', | ||||
| 		['resample-native-sse.c', | ||||
| 		 'resample-peaks-sse.c', | ||||
| 		 'volume-ops-sse.c', | ||||
| 		 'channelmix-ops-sse.c' ], | ||||
| 		c_args : [sse_args, '-O3', '-DHAVE_SSE'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_SSE'] | ||||
| 	simd_dependencies += audioconvert_sse | ||||
|   audioconvert_sse = static_library('audioconvert_sse', | ||||
|     ['resample-native-sse.c', | ||||
|       'resample-peaks-sse.c', | ||||
|       'volume-ops-sse.c', | ||||
|       'channelmix-ops-sse.c' ], | ||||
|     c_args : [sse_args, '-O3', '-DHAVE_SSE'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_SSE'] | ||||
|   simd_dependencies += audioconvert_sse | ||||
| endif | ||||
| if have_sse2 | ||||
| 	audioconvert_sse2 = static_library('audioconvert_sse2', | ||||
| 		['fmt-ops-sse2.c' ], | ||||
| 		c_args : [sse2_args, '-O3', '-DHAVE_SSE2'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_SSE2'] | ||||
| 	simd_dependencies += audioconvert_sse2 | ||||
|   audioconvert_sse2 = static_library('audioconvert_sse2', | ||||
|     ['fmt-ops-sse2.c' ], | ||||
|     c_args : [sse2_args, '-O3', '-DHAVE_SSE2'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_SSE2'] | ||||
|   simd_dependencies += audioconvert_sse2 | ||||
| endif | ||||
| if have_ssse3 | ||||
| 	audioconvert_ssse3 = static_library('audioconvert_ssse3', | ||||
| 		['fmt-ops-ssse3.c', | ||||
| 		 'resample-native-ssse3.c' ], | ||||
| 		c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_SSSE3'] | ||||
| 	simd_dependencies += audioconvert_ssse3 | ||||
|   audioconvert_ssse3 = static_library('audioconvert_ssse3', | ||||
|     ['fmt-ops-ssse3.c', | ||||
|       'resample-native-ssse3.c' ], | ||||
|     c_args : [ssse3_args, '-O3', '-DHAVE_SSSE3'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_SSSE3'] | ||||
|   simd_dependencies += audioconvert_ssse3 | ||||
| endif | ||||
| if have_sse41 | ||||
| 	audioconvert_sse41 = static_library('audioconvert_sse41', | ||||
| 		['fmt-ops-sse41.c'], | ||||
| 		c_args : [sse41_args, '-O3', '-DHAVE_SSE41'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_SSE41'] | ||||
| 	simd_dependencies += audioconvert_sse41 | ||||
|   audioconvert_sse41 = static_library('audioconvert_sse41', | ||||
|     ['fmt-ops-sse41.c'], | ||||
|     c_args : [sse41_args, '-O3', '-DHAVE_SSE41'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_SSE41'] | ||||
|   simd_dependencies += audioconvert_sse41 | ||||
| endif | ||||
| if have_avx and have_fma | ||||
| 	audioconvert_avx = static_library('audioconvert_avx', | ||||
| 		['resample-native-avx.c'], | ||||
| 		c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA'] | ||||
| 	simd_dependencies += audioconvert_avx | ||||
|   audioconvert_avx = static_library('audioconvert_avx', | ||||
|     ['resample-native-avx.c'], | ||||
|     c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA'] | ||||
|   simd_dependencies += audioconvert_avx | ||||
| endif | ||||
| if have_avx2 | ||||
| 	audioconvert_avx2 = static_library('audioconvert_avx2', | ||||
| 		['fmt-ops-avx2.c'], | ||||
| 		c_args : [avx2_args, '-O3', '-DHAVE_AVX2'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_AVX2'] | ||||
| 	simd_dependencies += audioconvert_avx2 | ||||
|   audioconvert_avx2 = static_library('audioconvert_avx2', | ||||
|     ['fmt-ops-avx2.c'], | ||||
|     c_args : [avx2_args, '-O3', '-DHAVE_AVX2'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_AVX2'] | ||||
|   simd_dependencies += audioconvert_avx2 | ||||
| endif | ||||
| 
 | ||||
| if have_neon | ||||
| 	audioconvert_neon = static_library('audioconvert_neon', | ||||
| 		['resample-native-neon.c', | ||||
| 		 'fmt-ops-neon.c' ], | ||||
| 		c_args : [neon_args, '-O3', '-DHAVE_NEON'], | ||||
| 		include_directories : [spa_inc], | ||||
| 		install : false | ||||
| 	) | ||||
| 	simd_cargs += ['-DHAVE_NEON'] | ||||
| 	simd_dependencies += audioconvert_neon | ||||
|   audioconvert_neon = static_library('audioconvert_neon', | ||||
|     ['resample-native-neon.c', | ||||
|       'fmt-ops-neon.c' ], | ||||
|     c_args : [neon_args, '-O3', '-DHAVE_NEON'], | ||||
|     include_directories : [spa_inc], | ||||
|     install : false | ||||
|     ) | ||||
|   simd_cargs += ['-DHAVE_NEON'] | ||||
|   simd_dependencies += audioconvert_neon | ||||
| endif | ||||
| 
 | ||||
| audioconvert = static_library('audioconvert', | ||||
| 	['fmt-ops.c', | ||||
| 	 'biquad.c', | ||||
|          'crossover.c', | ||||
| 	 'channelmix-ops.c', | ||||
| 	 'channelmix-ops-c.c', | ||||
| 	 'resample-native.c', | ||||
| 	 'resample-peaks.c', | ||||
| 	 'fmt-ops-c.c', | ||||
| 	 'volume-ops.c', | ||||
| 	 'volume-ops-c.c' ], | ||||
| 	c_args : [ simd_cargs, '-O3'], | ||||
|         link_with : simd_dependencies, | ||||
| 	include_directories : [spa_inc], | ||||
| 	install : false | ||||
| ) | ||||
|   ['fmt-ops.c', | ||||
|     'biquad.c', | ||||
|     'crossover.c', | ||||
|     'channelmix-ops.c', | ||||
|     'channelmix-ops-c.c', | ||||
|     'resample-native.c', | ||||
|     'resample-peaks.c', | ||||
|     'fmt-ops-c.c', | ||||
|     'volume-ops.c', | ||||
|     'volume-ops-c.c' ], | ||||
|   c_args : [ simd_cargs, '-O3'], | ||||
|   link_with : simd_dependencies, | ||||
|   include_directories : [spa_inc], | ||||
|   install : false | ||||
|   ) | ||||
| 
 | ||||
| audioconvertlib = shared_library('spa-audioconvert', | ||||
|                           audioconvert_sources, | ||||
| 			  c_args : simd_cargs, | ||||
|                           include_directories : [spa_inc], | ||||
|                           dependencies : [ mathlib ], | ||||
| 			  link_with : audioconvert, | ||||
|                           install : true, | ||||
|                           install_dir : spa_plugindir / 'audioconvert') | ||||
|   audioconvert_sources, | ||||
|   c_args : simd_cargs, | ||||
|   include_directories : [spa_inc], | ||||
|   dependencies : [ mathlib ], | ||||
|   link_with : audioconvert, | ||||
|   install : true, | ||||
|   install_dir : spa_plugindir / 'audioconvert') | ||||
| 
 | ||||
| test_lib = static_library('test_lib', | ||||
| 	['test-source.c' ], | ||||
| 	c_args : ['-O3'], | ||||
| 	include_directories : [spa_inc], | ||||
| 	install : false | ||||
| ) | ||||
|   ['test-source.c' ], | ||||
|   c_args : ['-O3'], | ||||
|   include_directories : [spa_inc], | ||||
|   install : false | ||||
|   ) | ||||
| 
 | ||||
| test_apps = [ | ||||
| 	'test-audioadapter', | ||||
| 	'test-audioconvert', | ||||
| 	'test-channelmix', | ||||
| 	'test-fmt-ops', | ||||
| 	'test-resample', | ||||
| ] | ||||
|   'test-audioadapter', | ||||
|   'test-audioconvert', | ||||
|   'test-channelmix', | ||||
|   'test-fmt-ops', | ||||
|   'test-resample', | ||||
|   ] | ||||
| 
 | ||||
| foreach a : test_apps | ||||
|   test(a, | ||||
| 	executable(a, a + '.c', | ||||
| 		dependencies : [dl_lib, pthread_lib, mathlib ], | ||||
| 		include_directories : [ configinc, spa_inc ], | ||||
| 		link_with : [ audioconvert, test_lib, audioconvertlib ], | ||||
| 		install_rpath : spa_plugindir / 'audioconvert', | ||||
| 		c_args : [ simd_cargs ], | ||||
| 		install : installed_tests_enabled, | ||||
| 		install_dir : installed_tests_execdir / 'audioconvert'), | ||||
| 	env : [ | ||||
| 		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), | ||||
| 	]) | ||||
|     executable(a, a + '.c', | ||||
|       dependencies : [dl_lib, pthread_lib, mathlib ], | ||||
|       include_directories : [ configinc, spa_inc ], | ||||
|       link_with : [ audioconvert, test_lib, audioconvertlib ], | ||||
|       install_rpath : spa_plugindir / 'audioconvert', | ||||
|       c_args : [ simd_cargs ], | ||||
|       install : installed_tests_enabled, | ||||
|       install_dir : installed_tests_execdir / 'audioconvert'), | ||||
|       env : [ | ||||
|         'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), | ||||
|         ]) | ||||
| 
 | ||||
|   if installed_tests_enabled | ||||
|     test_conf = configuration_data() | ||||
|     test_conf.set('exec', | ||||
|                   installed_tests_execdir / 'audioconvert' / a) | ||||
|     configure_file( | ||||
|       input: installed_tests_template, | ||||
|       output: a + '.test', | ||||
|       install_dir: installed_tests_metadir / 'audioconvert', | ||||
|       configuration: test_conf | ||||
|     ) | ||||
|     if installed_tests_enabled | ||||
|       test_conf = configuration_data() | ||||
|       test_conf.set('exec', installed_tests_execdir / 'audioconvert' / a) | ||||
|       configure_file( | ||||
|         input: installed_tests_template, | ||||
|         output: a + '.test', | ||||
|         install_dir: installed_tests_metadir / 'audioconvert', | ||||
|         configuration: test_conf | ||||
|         ) | ||||
|   endif | ||||
| endforeach | ||||
| 
 | ||||
| benchmark_apps = [ | ||||
| 	'benchmark-fmt-ops', | ||||
| 	'benchmark-resample', | ||||
| ] | ||||
|   'benchmark-fmt-ops', | ||||
|   'benchmark-resample', | ||||
|   ] | ||||
| 
 | ||||
| foreach a : benchmark_apps | ||||
|   benchmark(a, | ||||
| 	executable(a, a + '.c', | ||||
| 		dependencies : [dl_lib, pthread_lib, mathlib, ], | ||||
| 		include_directories : [ configinc, spa_inc ], | ||||
| 		c_args : [ simd_cargs ], | ||||
| 		link_with : [ audioconvert, audioconvertlib ], | ||||
| 		install_rpath : spa_plugindir / 'audioconvert', | ||||
| 		install : installed_tests_enabled, | ||||
| 		install_dir : installed_tests_execdir / 'audioconvert'), | ||||
| 	env : [ | ||||
| 		'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), | ||||
| 	]) | ||||
|     executable(a, a + '.c', | ||||
|       dependencies : [dl_lib, pthread_lib, mathlib, ], | ||||
|       include_directories : [ configinc, spa_inc ], | ||||
|       c_args : [ simd_cargs ], | ||||
|       link_with : [ audioconvert, audioconvertlib ], | ||||
|       install_rpath : spa_plugindir / 'audioconvert', | ||||
|       install : installed_tests_enabled, | ||||
|       install_dir : installed_tests_execdir / 'audioconvert'), | ||||
|       env : [ | ||||
|         'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), | ||||
|         ]) | ||||
| 
 | ||||
|   if installed_tests_enabled | ||||
|     test_conf = configuration_data() | ||||
|     test_conf.set('exec', | ||||
|                   installed_tests_execdir / 'audioconvert' / a) | ||||
|     configure_file( | ||||
|       input: installed_tests_template, | ||||
|       output: a + '.test', | ||||
|       install_dir: installed_tests_metadir / 'audioconvert', | ||||
|       configuration: test_conf | ||||
|     ) | ||||
|     if installed_tests_enabled | ||||
|       test_conf = configuration_data() | ||||
|       test_conf.set('exec', installed_tests_execdir / 'audioconvert' / a) | ||||
|       configure_file( | ||||
|         input: installed_tests_template, | ||||
|         output: a + '.test', | ||||
|         install_dir: installed_tests_metadir / 'audioconvert', | ||||
|         configuration: test_conf | ||||
|         ) | ||||
|   endif | ||||
| endforeach | ||||
| 
 | ||||
| if sndfile_dep.found() | ||||
|   sparesample_sources = [ | ||||
|     'spa-resample.c', | ||||
|   ] | ||||
|     ] | ||||
|   executable('spa-resample', | ||||
|     sparesample_sources, | ||||
|     c_args : [ simd_cargs ], | ||||
|  | @ -198,5 +196,5 @@ if sndfile_dep.found() | |||
|     link_with : [ audioconvert, test_lib ], | ||||
|     dependencies : [sndfile_dep, mathlib], | ||||
|     install : true, | ||||
|   ) | ||||
|     ) | ||||
| endif | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Peter Hutterer
						Peter Hutterer