mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
build-sys: meson: Fix indentation in daemon/client blocks
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/659>
This commit is contained in:
Igor V. Kovalenko
PulseAudio Marge Bot
parent
5f43173209
commit
5fcc70e2e8
4 changed files with 172 additions and 173 deletions
|
|
@ -15,23 +15,23 @@ if get_option('daemon')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('client')
|
if get_option('client')
|
||||||
manpages += [
|
|
||||||
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
|
|
||||||
['pactl', '1'],
|
|
||||||
['pulse-client.conf', '5'],
|
|
||||||
]
|
|
||||||
|
|
||||||
if cdata.has('HAVE_OSS_WRAPPER')
|
|
||||||
manpages += [
|
manpages += [
|
||||||
['padsp', '1'],
|
['pacat', '1', ['paplay', 'parec', 'parecord', 'pamon']],
|
||||||
|
['pactl', '1'],
|
||||||
|
['pulse-client.conf', '5'],
|
||||||
]
|
]
|
||||||
endif
|
|
||||||
|
|
||||||
if x11_dep.found()
|
if cdata.has('HAVE_OSS_WRAPPER')
|
||||||
manpages += [
|
manpages += [
|
||||||
['pax11publish', '1'],
|
['padsp', '1'],
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if x11_dep.found()
|
||||||
|
manpages += [
|
||||||
|
['pax11publish', '1'],
|
||||||
|
]
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# FIXME: Add esdcompat if HAVE_ESOUND
|
# FIXME: Add esdcompat if HAVE_ESOUND
|
||||||
|
|
|
||||||
114
meson.build
114
meson.build
|
|
@ -848,69 +848,69 @@ configure_file(output : 'config.h', configuration : cdata)
|
||||||
|
|
||||||
if get_option('client')
|
if get_option('client')
|
||||||
|
|
||||||
# pkg-config files
|
# pkg-config files
|
||||||
|
|
||||||
pc_cdata = configuration_data()
|
pc_cdata = configuration_data()
|
||||||
|
|
||||||
pc_cdata.set('prefix', prefix)
|
pc_cdata.set('prefix', prefix)
|
||||||
pc_cdata.set('exec_prefix', prefix)
|
pc_cdata.set('exec_prefix', prefix)
|
||||||
pc_cdata.set('libdir', libdir)
|
pc_cdata.set('libdir', libdir)
|
||||||
pc_cdata.set('includedir', includedir)
|
pc_cdata.set('includedir', includedir)
|
||||||
pc_cdata.set('modlibexecdir', modlibexecdir)
|
pc_cdata.set('modlibexecdir', modlibexecdir)
|
||||||
pc_cdata.set('PACKAGE_VERSION', pa_version_str)
|
pc_cdata.set('PACKAGE_VERSION', pa_version_str)
|
||||||
pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
|
pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor)
|
||||||
# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
|
# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation,
|
||||||
# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
|
# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or
|
||||||
# get_configtool_variable() work with it, so we have no way to get this flag right,
|
# get_configtool_variable() work with it, so we have no way to get this flag right,
|
||||||
# unless we do all the work ourselves. See current work in glib, also meson #553.
|
# unless we do all the work ourselves. See current work in glib, also meson #553.
|
||||||
pc_cdata.set('PTHREAD_LIBS', '-pthread')
|
pc_cdata.set('PTHREAD_LIBS', '-pthread')
|
||||||
|
|
||||||
pc_files = [
|
pc_files = [
|
||||||
'libpulse.pc',
|
'libpulse.pc',
|
||||||
'libpulse-simple.pc',
|
'libpulse-simple.pc',
|
||||||
]
|
]
|
||||||
|
|
||||||
if glib_dep.found()
|
if glib_dep.found()
|
||||||
pc_files += 'libpulse-mainloop-glib.pc'
|
pc_files += 'libpulse-mainloop-glib.pc'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
foreach file : pc_files
|
||||||
|
configure_file(
|
||||||
|
input : file + '.in',
|
||||||
|
output : file,
|
||||||
|
configuration : pc_cdata,
|
||||||
|
install_dir : pkgconfigdir)
|
||||||
|
endforeach
|
||||||
|
|
||||||
|
# CMake files
|
||||||
|
|
||||||
|
m4 = find_program('m4', required: true)
|
||||||
|
|
||||||
|
cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
|
||||||
|
|
||||||
|
cmake_template_file = configure_file(
|
||||||
|
input : 'PulseAudioConfig.cmake.in',
|
||||||
|
output : 'PulseAudioConfig.cmake.tmp',
|
||||||
|
configuration: cdata,
|
||||||
|
)
|
||||||
|
|
||||||
|
custom_target('PulseAudioConfig.cmake',
|
||||||
|
input : cmake_template_file,
|
||||||
|
output : 'PulseAudioConfig.cmake',
|
||||||
|
capture : true,
|
||||||
|
command : [m4, '@INPUT@'],
|
||||||
|
build_by_default : true,
|
||||||
|
install : true,
|
||||||
|
install_dir : cmakedir,
|
||||||
|
)
|
||||||
|
|
||||||
foreach file : pc_files
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input : file + '.in',
|
input : 'PulseAudioConfigVersion.cmake.in',
|
||||||
output : file,
|
output : 'PulseAudioConfigVersion.cmake',
|
||||||
configuration : pc_cdata,
|
configuration: cdata,
|
||||||
install_dir : pkgconfigdir)
|
install : true,
|
||||||
endforeach
|
install_dir : cmakedir,
|
||||||
|
)
|
||||||
# CMake files
|
|
||||||
|
|
||||||
m4 = find_program('m4', required: true)
|
|
||||||
|
|
||||||
cmakedir = join_paths(libdir, 'cmake', 'PulseAudio')
|
|
||||||
|
|
||||||
cmake_template_file = configure_file(
|
|
||||||
input : 'PulseAudioConfig.cmake.in',
|
|
||||||
output : 'PulseAudioConfig.cmake.tmp',
|
|
||||||
configuration: cdata,
|
|
||||||
)
|
|
||||||
|
|
||||||
custom_target('PulseAudioConfig.cmake',
|
|
||||||
input : cmake_template_file,
|
|
||||||
output : 'PulseAudioConfig.cmake',
|
|
||||||
capture : true,
|
|
||||||
command : [m4, '@INPUT@'],
|
|
||||||
build_by_default : true,
|
|
||||||
install : true,
|
|
||||||
install_dir : cmakedir,
|
|
||||||
)
|
|
||||||
|
|
||||||
configure_file(
|
|
||||||
input : 'PulseAudioConfigVersion.cmake.in',
|
|
||||||
output : 'PulseAudioConfigVersion.cmake',
|
|
||||||
configuration: cdata,
|
|
||||||
install : true,
|
|
||||||
install_dir : cmakedir,
|
|
||||||
)
|
|
||||||
|
|
||||||
endif # client
|
endif # client
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -193,26 +193,25 @@ if not get_option('client')
|
||||||
libpulse_dep = dependency('libpulse', required : true)
|
libpulse_dep = dependency('libpulse', required : true)
|
||||||
libpulse_simple_dep = dependency('libpulse-simple', required : true)
|
libpulse_simple_dep = dependency('libpulse-simple', required : true)
|
||||||
else
|
else
|
||||||
|
libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
|
||||||
|
libpulsecommon_sources,
|
||||||
|
libpulsecommon_headers,
|
||||||
|
include_directories : [configinc, topinc],
|
||||||
|
c_args : [pa_c_args],
|
||||||
|
link_args : [nodelete_link_args],
|
||||||
|
install : true,
|
||||||
|
install_dir : privlibdir,
|
||||||
|
dependencies : [
|
||||||
|
libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
|
||||||
|
x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
|
||||||
|
gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
|
||||||
|
platform_dep, platform_socket_dep, execinfo_dep,
|
||||||
|
],
|
||||||
|
implicit_include_directories : false)
|
||||||
|
|
||||||
libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor,
|
libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
|
||||||
libpulsecommon_sources,
|
|
||||||
libpulsecommon_headers,
|
|
||||||
include_directories : [configinc, topinc],
|
|
||||||
c_args : [pa_c_args],
|
|
||||||
link_args : [nodelete_link_args],
|
|
||||||
install : true,
|
|
||||||
install_dir : privlibdir,
|
|
||||||
dependencies : [
|
|
||||||
libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep,
|
|
||||||
x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true),
|
|
||||||
gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep,
|
|
||||||
platform_dep, platform_socket_dep, execinfo_dep,
|
|
||||||
],
|
|
||||||
implicit_include_directories : false)
|
|
||||||
|
|
||||||
libpulsecommon_dep = declare_dependency(link_with: libpulsecommon)
|
subdir('pulse')
|
||||||
|
|
||||||
subdir('pulse')
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('daemon')
|
if get_option('daemon')
|
||||||
|
|
|
||||||
|
|
@ -1,47 +1,47 @@
|
||||||
if get_option('client')
|
if get_option('client')
|
||||||
pacat_sources = [
|
pacat_sources = [
|
||||||
'pacat.c',
|
'pacat.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
pacat_aliases = [
|
pacat_aliases = [
|
||||||
'pamon',
|
'pamon',
|
||||||
'paplay',
|
'paplay',
|
||||||
'parec',
|
'parec',
|
||||||
'parecord',
|
'parecord',
|
||||||
]
|
]
|
||||||
|
|
||||||
executable('pacat',
|
executable('pacat',
|
||||||
pacat_sources,
|
pacat_sources,
|
||||||
install: true,
|
install: true,
|
||||||
install_rpath : privlibdir,
|
install_rpath : privlibdir,
|
||||||
include_directories : [configinc, topinc],
|
include_directories : [configinc, topinc],
|
||||||
link_with : [libpulsecommon, libpulse],
|
link_with : [libpulsecommon, libpulse],
|
||||||
dependencies : [sndfile_dep, libintl_dep],
|
dependencies : [sndfile_dep, libintl_dep],
|
||||||
c_args : pa_c_args,
|
c_args : pa_c_args,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Windows doesn't support symbolic links.
|
# Windows doesn't support symbolic links.
|
||||||
if host_machine.system() != 'windows'
|
if host_machine.system() != 'windows'
|
||||||
foreach alias : pacat_aliases
|
foreach alias : pacat_aliases
|
||||||
dst = join_paths(bindir, alias)
|
dst = join_paths(bindir, alias)
|
||||||
cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pacat', dst)
|
cmd = 'ln -fs @0@ $DESTDIR@1@'.format('pacat', dst)
|
||||||
meson.add_install_script('sh', '-c', cmd)
|
meson.add_install_script('sh', '-c', cmd)
|
||||||
endforeach
|
endforeach
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pactl_sources = [
|
pactl_sources = [
|
||||||
'pactl.c',
|
'pactl.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
executable('pactl',
|
executable('pactl',
|
||||||
pactl_sources,
|
pactl_sources,
|
||||||
install: true,
|
install: true,
|
||||||
install_rpath : privlibdir,
|
install_rpath : privlibdir,
|
||||||
include_directories : [configinc, topinc],
|
include_directories : [configinc, topinc],
|
||||||
link_with : [libpulsecommon, libpulse],
|
link_with : [libpulsecommon, libpulse],
|
||||||
dependencies : [sndfile_dep, libintl_dep],
|
dependencies : [sndfile_dep, libintl_dep],
|
||||||
c_args : pa_c_args,
|
c_args : pa_c_args,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('daemon')
|
if get_option('daemon')
|
||||||
|
|
@ -75,51 +75,51 @@ if get_option('daemon')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if get_option('client')
|
if get_option('client')
|
||||||
if x11_dep.found()
|
if x11_dep.found()
|
||||||
pax11publish_sources = [
|
pax11publish_sources = [
|
||||||
'pax11publish.c',
|
'pax11publish.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
executable('pax11publish',
|
executable('pax11publish',
|
||||||
pax11publish_sources,
|
pax11publish_sources,
|
||||||
install: true,
|
install: true,
|
||||||
install_rpath : privlibdir,
|
install_rpath : privlibdir,
|
||||||
include_directories : [configinc, topinc],
|
include_directories : [configinc, topinc],
|
||||||
link_with : [libpulsecommon, libpulse],
|
link_with : [libpulsecommon, libpulse],
|
||||||
dependencies : [x11_dep, libintl_dep],
|
dependencies : [x11_dep, libintl_dep],
|
||||||
c_args : pa_c_args,
|
c_args : pa_c_args,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if cdata.has('HAVE_OSS_WRAPPER')
|
if cdata.has('HAVE_OSS_WRAPPER')
|
||||||
libpulsecommon_sources = [
|
libpulsecommon_sources = [
|
||||||
'padsp.c',
|
'padsp.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
libpulsedsp = shared_library('pulsedsp',
|
libpulsedsp = shared_library('pulsedsp',
|
||||||
libpulsecommon_sources,
|
libpulsecommon_sources,
|
||||||
install: true,
|
install: true,
|
||||||
install_dir : padsplibdir,
|
install_dir : padsplibdir,
|
||||||
install_rpath : privlibdir,
|
install_rpath : privlibdir,
|
||||||
include_directories : [configinc, topinc],
|
include_directories : [configinc, topinc],
|
||||||
link_with : [libpulsecommon, libpulse],
|
link_with : [libpulsecommon, libpulse],
|
||||||
link_args : [nodelete_link_args],
|
link_args : [nodelete_link_args],
|
||||||
dependencies: [thread_dep, dl_dep],
|
dependencies: [thread_dep, dl_dep],
|
||||||
c_args : [pa_c_args, '-Wno-nonnull-compare']
|
c_args : [pa_c_args, '-Wno-nonnull-compare']
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input : 'padsp.in',
|
input : 'padsp.in',
|
||||||
output : 'padsp',
|
output : 'padsp',
|
||||||
configuration : cdata,
|
configuration : cdata,
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : bindir,
|
install_dir : bindir,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if dbus_dep.found() and fftw_dep.found()
|
if dbus_dep.found() and fftw_dep.found()
|
||||||
install_data('qpaeq', install_dir : bindir)
|
install_data('qpaeq', install_dir : bindir)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install_data('pa-info', install_dir : bindir)
|
install_data('pa-info', install_dir : bindir)
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue