pw-uninstalled: set SPA_DATA_DIR + fix meson devenv

Set SPA_DATA_DIR needed for the bluez5 plugin hwdb file in
pw-uninstalled.

Also fix its value for meson devenv.
This commit is contained in:
Pauli Virtanen 2021-09-19 20:59:19 +03:00 committed by Wim Taymans
parent def45adaec
commit 229892d45d
2 changed files with 2 additions and 1 deletions

View File

@ -469,7 +469,7 @@ if meson.version().version_compare('>=0.58.0')
devenv.set('PIPEWIRE_MODULE_DIR', builddir / 'src' / 'modules')
devenv.set('SPA_PLUGIN_DIR', builddir / 'spa' / 'plugins')
devenv.set('SPA_DATA_DIR', builddir / 'spa' / 'plugins')
devenv.set('SPA_DATA_DIR', srcdir / 'spa' / 'plugins')
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')

View File

@ -38,6 +38,7 @@ fi
export PIPEWIRE_CONFIG_DIR="${BUILDDIR}/src/daemon"
# the directory with SPA plugins
export SPA_PLUGIN_DIR="${BUILDDIR}/spa/plugins"
export SPA_DATA_DIR="${SCRIPT_DIR}/spa/plugins"
# the directory with pipewire modules
export PIPEWIRE_MODULE_DIR="${BUILDDIR}/src/modules"
export PATH="${BUILDDIR}/src/daemon:${BUILDDIR}/src/tools:${BUILDDIR}/src/examples:${PATH}"