1 --- domoticz-2021.1/hardware/plugins/DelayedLink.h.orig 2021-04-17 17:50:55.000000000 +0200
2 +++ domoticz-2021.1/hardware/plugins/DelayedLink.h 2021-04-20 12:36:46.238826640 +0200
4 if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
5 if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
7 - if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll");
8 - if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
9 - if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
10 - if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
11 - if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
12 - if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
13 + if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
16 - if (!shared_lib_) FindLibrary("python3.9", true);
17 - if (!shared_lib_) FindLibrary("python3.8", true);
18 - if (!shared_lib_) FindLibrary("python3.7", true);
19 - if (!shared_lib_) FindLibrary("python3.6", true);
20 - if (!shared_lib_) FindLibrary("python3.5", true);
21 - if (!shared_lib_) FindLibrary("python3.4", true);
22 + if (!shared_lib_) FindLibrary(PYTHON_LIBDIR, false);
24 if (!shared_lib_) FindLibrary("python3.7m", true);
25 if (!shared_lib_) FindLibrary("python3.6m", true);
29 std::vector<std::string> entries;
30 - DirectoryListing(entries, sLibrary, true, false);
31 - for (const auto &entry : entries)
38 - library = sLibrary + entry + "/";
39 - FindLibrary(library, false);
43 DirectoryListing(entries, sLibrary, false, true);
44 for (const auto &filename : entries)
51 if (filename.length() > 12 &&
52 filename.compare(0, 11, "libpython3.") == 0 &&
53 - filename.compare(filename.length() - 3, 3, ".so") == 0 &&
54 - filename.compare(filename.length() - 6, 6, ".dylib") == 0)
55 + filename.find(".so", 10) != std::string::npos)
57 - library = sLibrary + filename;
58 + library = sLibrary + "/" + filename;
59 shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);