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

obs-scripting: Fix macOS Homebrew Python loading

Browse Source
This commit is contained in:
jcm 2024-12-06 13:26:02 -06:00 committed by Ryan Foster
parent fb56e06edd
commit 83934acb44
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared/obs-scripting/obs-scripting-python-import.c
View File

@ -35,7 +35,7 @@
#define PATH_MAX MAX_PATH #define PATH_MAX MAX_PATH
#elif __APPLE__ #elif __APPLE__
#define VERSION_PATTERN "%d.%d" #define VERSION_PATTERN "%d.%d"
#define FILE_PATTERN "Python.framework/Versions/Current/lib/libpython%s.dylib" #define FILE_PATTERN "Python.framework/Versions/%s/lib/libpython%s.dylib"
#endif #endif
#define PY_MAJOR_VERSION_MAX 3 #define PY_MAJOR_VERSION_MAX 3
@ -71,7 +71,7 @@ bool import_python(const char *python_path, python_version_t *python_version)
struct dstr temp; struct dstr temp;
dstr_init(&temp); dstr_init(&temp);
dstr_printf(&temp, FILE_PATTERN, cur_version); dstr_printf(&temp, FILE_PATTERN, cur_version, cur_version);
int minor_version = PY_MINOR_VERSION_MAX; int minor_version = PY_MINOR_VERSION_MAX;
do { do {

3
shared/obs-scripting/obs-scripting-python.c
View File

@ -1607,7 +1607,8 @@ bool obs_scripting_load_python(const char *python_path)
if (python_path && *python_path) { if (python_path && *python_path) {
#ifdef __APPLE__ #ifdef __APPLE__
char temp[PATH_MAX]; char temp[PATH_MAX];
snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/Current", python_path); snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/%i.%i", python_path, python_version.major,
python_version.minor);
os_utf8_to_wcs(temp, 0, home_path, PATH_MAX); os_utf8_to_wcs(temp, 0, home_path, PATH_MAX);
Py_SetPythonHome(home_path); Py_SetPythonHome(home_path);
#else #else