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

SPA_DATA_DIR is the source root when uninstalled

Browse source 
Add some more error logging to bluez5 quirk loading.
This commit is contained in:
Wim Taymans 2022-03-18 21:30:39 +01:00
parent 186d0a783e
commit b868ec36c5
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -17,7 +17,7 @@ clean:
run: all
SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules \
PATH=$(BUILD_ROOT)/src/examples:$(PATH) \
PIPEWIRE_CONFIG_DIR=$(BUILD_ROOT)/src/daemon \
@ -27,7 +27,7 @@ run: all
run-pulse: all
SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules \
PIPEWIRE_CONFIG_DIR=$(BUILD_ROOT)/src/daemon \
ACP_PATHS_DIR=$(SOURCE_ROOT)/spa/plugins/alsa/mixer/paths \
@ -48,13 +48,13 @@ benchmark: all
monitor: all
SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules/ \
$(BUILD_ROOT)/src/tools/pw-mon
cli: all
SPA_PLUGIN_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(BUILD_ROOT)/spa/plugins \
SPA_DATA_DIR=$(SOURCE_ROOT)/spa/plugins \
PIPEWIRE_MODULE_DIR=$(BUILD_ROOT)/src/modules/ \
$(BUILD_ROOT)/src/tools/pw-cli

6
spa/plugins/bluez5/quirks.c
View file

@ -262,14 +262,16 @@ struct spa_bt_quirks *spa_bt_quirks_create(const struct spa_dict *info, struct s
} else {
char path[PATH_MAX];
const char *dir = getenv("SPA_DATA_DIR");
int res;
if (dir == NULL)
dir = SPADATADIR;
if (spa_scnprintf(path, sizeof(path), "%s/bluez5/bluez-hardware.conf", dir) >= 0)
load_conf(this, path);
if ((res = load_conf(this, path)) < 0)
spa_log_warn(this->log, "failed to load '%s': %s", path,
spa_strerror(res));
}
if (!(this->kernel_rules && this->adapter_rules && this->device_rules))
spa_log_warn(this->log, "failed to load bluez-hardware.conf");

2
test/pwtest.c
View file

@ -804,7 +804,7 @@ static void set_test_env(struct pwtest_context *ctx, struct pwtest_test *t)
replace_env(t, "TMPDIR", xdg_runtime_dir);
replace_env(t, "SPA_PLUGIN_DIR", BUILD_ROOT "/spa/plugins");
replace_env(t, "SPA_DATA_DIR", BUILD_ROOT "/spa/plugins");
replace_env(t, "SPA_DATA_DIR", SOURCE_ROOT "/spa/plugins");
replace_env(t, "PIPEWIRE_CONFIG_DIR", BUILD_ROOT "/src/daemon");
replace_env(t, "PIPEWIRE_MODULE_DIR", BUILD_ROOT "/src/modules");
replace_env(t, "ACP_PATHS_DIR", SOURCE_ROOT "/spa/plugins/alsa/mixer/paths");