mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson.build: remove version check around devenv

Browse source 
Since 01c6fd0a88 the
minimum required meson version is 0.59.0, therefore
there is no need to check if it's at least 0.58.0,
which was needed for the devenv functionality.
This commit is contained in:
Barnabás Pőcze 2022-01-17 08:02:57 +01:00 • committed by Wim Taymans
parent a36f902e1d
commit 33fb98fddf
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
meson.build
View file

@ -502,27 +502,25 @@ run_target('pw-uninstalled',
'-v@0@'.format(pipewire_version)] '-v@0@'.format(pipewire_version)]
) )
if meson.version().version_compare('>=0.58.0') devenv = environment()
devenv = environment()
builddir = meson.project_build_root() builddir = meson.project_build_root()
srcdir = meson.project_source_root() srcdir = meson.project_source_root()
devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable(internal: 'confdatadir')) devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable(internal: 'confdatadir'))
devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable(internal: 'moduledir')) devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable(internal: 'moduledir'))
devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir')) devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir'))
devenv.set('SPA_DATA_DIR', spa_dep.get_variable(internal: 'datadir')) devenv.set('SPA_DATA_DIR', spa_dep.get_variable(internal: 'datadir'))
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst') devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')
devenv.set('ALSA_PLUGIN_DIR', builddir / 'pipewire-alsa' / 'alsa-plugins') devenv.set('ALSA_PLUGIN_DIR', builddir / 'pipewire-alsa' / 'alsa-plugins')
devenv.set('ACP_PATHS_DIR', srcdir / 'spa' / 'plugins' / 'alsa' / 'mixer' / 'paths') devenv.set('ACP_PATHS_DIR', srcdir / 'spa' / 'plugins' / 'alsa' / 'mixer' / 'paths')
devenv.set('ACP_PROFILES_DIR', srcdir / 'spa' / 'plugins' / 'alsa' / 'mixer' / 'profile-sets') devenv.set('ACP_PROFILES_DIR', srcdir / 'spa' / 'plugins' / 'alsa' / 'mixer' / 'profile-sets')
devenv.set('LD_LIBRARY_PATH', builddir / 'pipewire-jack' / 'src') devenv.set('LD_LIBRARY_PATH', builddir / 'pipewire-jack' / 'src')
devenv.set('PW_UNINSTALLED', '1') devenv.set('PW_UNINSTALLED', '1')
meson.add_devenv(devenv) meson.add_devenv(devenv)
endif