fdo-mirrors/pipewire-media-session
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/media-session.git synced 2026-05-09 07:28:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: use project_{source|build}_root from meson 0.56

Browse source 
This is better for embedding as subproject which is what we tend to do
with media-session now.

This requires meson 0.56 and the matching fixup to the pkgconfig
variable handling deprecated in that version.
This commit is contained in:
Peter Hutterer 2021-10-20 11:51:40 +10:00
parent 90ae1c2db4
commit e84449d743
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
doc/meson.build
View file

@ -1,8 +1,8 @@
doxyfile_conf = configuration_data()
doxyfile_conf.set('PACKAGE_NAME', meson.project_name())
doxyfile_conf.set('PACKAGE_VERSION', meson.project_version())
doxyfile_conf.set('top_srcdir', meson.source_root())
doxyfile_conf.set('top_builddir', meson.build_root())
doxyfile_conf.set('top_srcdir', meson.project_source_root())
doxyfile_conf.set('top_builddir', meson.project_build_root())
dot_found = find_program('dot', required: false).found()
summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs')
@ -20,27 +20,27 @@ extra_docs = [
inputs = []
foreach extra : extra_docs
inputs += meson.source_root() / 'doc' / extra
inputs += meson.project_source_root() / 'doc' / extra
endforeach
foreach h : media_session_sources
inputs += meson.source_root() / 'src' / h
inputs += meson.project_source_root() / 'src' / h
endforeach
path_prefixes = [
meson.source_root() / 'src',
meson.source_root(),
meson.project_source_root() / 'src',
meson.project_source_root(),
]
cssfiles = [
meson.source_root() / 'doc' / 'doxygen-awesome.css',
meson.source_root() / 'doc' / 'custom.css'
meson.project_source_root() / 'doc' / 'doxygen-awesome.css',
meson.project_source_root() / 'doc' / 'custom.css'
]
doxyfile_conf.set('inputs', ' '.join(inputs))
doxyfile_conf.set('cssfiles', ' '.join(cssfiles))
doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))
doxyfile_conf.set('c_input_filter', meson.source_root() / 'doc' / 'input-filter.sh')
doxyfile_conf.set('h_input_filter', meson.source_root() / 'doc' / 'input-filter-h.sh')
doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')
doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')
doxyfile = configure_file(input: 'Doxyfile.in',
output: 'Doxyfile',

4
meson.build
View file

@ -1,7 +1,7 @@
project('media-session', ['c'],
version : '0.3.38',
license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
meson_version : '>= 0.54.0',
meson_version : '>= 0.56.0',
default_options : [ 'warning_level=3',
'c_std=gnu99',
'b_pie=true',
@ -124,7 +124,7 @@ endif
setenv = find_program('media-session-uninstalled.sh')
run_target('media-session-uninstalled',
command : [setenv,
'-b@0@'.format(meson.build_root()),
'-b@0@'.format(meson.project_build_root()),
'-v@0@'.format(media_session_version)]
)

3
systemd/system/meson.build
View file

@ -1,4 +1,5 @@
systemd_system_services_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir', define_variable : [ 'prefix', prefix])
systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir',
pkgconfig_define: [ 'prefix', prefix])
systemd_config = configuration_data()
systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session')

3
systemd/user/meson.build
View file

@ -1,4 +1,5 @@
systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir', define_variable : [ 'prefix', prefix])
systemd_user_services_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir',
pkgconfig_define: [ 'prefix', prefix])
if get_option('systemd-user-unit-dir') != ''
systemd_user_services_dir = get_option('systemd-user-unit-dir')
endif