1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libobs: Fix relocatable Linux builds using legacy portable build flag

Browse Source
This commit is contained in:
PatTheMav 2024-04-15 13:14:04 +02:00 committed by Ryan Foster
parent d661160560
commit cb1a4c1c61
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/obs-nix.c
View File

@ -56,7 +56,7 @@ static const char *module_bin[] = {
}; };
static const char *module_data[] = { static const char *module_data[] = {
OBS_DATA_PATH "/%module%", OBS_DATA_PATH "/obs-plugins/%module%",
OBS_INSTALL_DATA_PATH "/obs-plugins/%module%", OBS_INSTALL_DATA_PATH "/obs-plugins/%module%",
FLATPAK_PLUGIN_PATH "/share/obs/obs-plugins/%module%", FLATPAK_PLUGIN_PATH "/share/obs/obs-plugins/%module%",
}; };
@ -76,7 +76,9 @@ void add_default_module_paths(void)
if (module_bin_path && module_data_path) { if (module_bin_path && module_data_path) {
char *abs_module_bin_path = char *abs_module_bin_path =
os_get_abs_path_ptr(module_bin_path); os_get_abs_path_ptr(module_bin_path);
if (strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX
if (abs_module_bin_path &&
strcmp(abs_module_bin_path, OBS_INSTALL_PREFIX
"/" OBS_PLUGIN_DESTINATION) != 0) { "/" OBS_PLUGIN_DESTINATION) != 0) {
obs_add_module_path(module_bin_path, module_data_path); obs_add_module_path(module_bin_path, module_data_path);
} }