up to 2021.1

[packages/domoticz.git] / domoticz-python.patch

diff --git a/domoticz-python.patch b/domoticz-python.patch
index e6332deb79b07db21f52e55ae5dbe6828a2925c2..493229e2d30f7da2dc60f2ab67af656a54e57229 100644 (file)
--- a/domoticz-python.patch
+++ b/domoticz-python.patch
@@ -17,26 +17,30 @@ diff --git a/hardware/plugins/DelayedLink.h b/hardware/plugins/DelayedLink.h
 index 25c83f034..ecf19da09 100644
 --- a/hardware/plugins/DelayedLink.h
 +++ b/hardware/plugins/DelayedLink.h
-@@ -126,16 +126,10 @@ namespace Plugins {
+@@ -150,20 +150,10 @@
                                if (!shared_lib_) shared_lib_ = LoadLibrary("python35_d.dll");
                                if (!shared_lib_) shared_lib_ = LoadLibrary("python34_d.dll");
  #     else
+-                              if (!shared_lib_) shared_lib_ = LoadLibrary("python39.dll");
+-                              if (!shared_lib_) shared_lib_ = LoadLibrary("python38.dll");
 -                              if (!shared_lib_) shared_lib_ = LoadLibrary("python37.dll");
 -                              if (!shared_lib_) shared_lib_ = LoadLibrary("python36.dll");
 -                              if (!shared_lib_) shared_lib_ = LoadLibrary("python35.dll");
 -                              if (!shared_lib_) shared_lib_ = LoadLibrary("python34.dll");
-+                              if (!shared_lib_) shared_lib_ = LoadLibrary("python3.dll");
++                              if (!shared_lib_) shared_lib_ = LoadLibrary("python.dll");
  #     endif
  #else
+-                              if (!shared_lib_) FindLibrary("python3.9", true);
+-                              if (!shared_lib_) FindLibrary("python3.8", true);
 -                              if (!shared_lib_) FindLibrary("python3.7", true);
 -                              if (!shared_lib_) FindLibrary("python3.6", true);
 -                              if (!shared_lib_) FindLibrary("python3.5", true);
 -                              if (!shared_lib_) FindLibrary("python3.4", true);
 +                              if (!shared_lib_) FindLibrary("python3", true);
- #endif
-                               if (shared_lib_)
-                               {
-@@ -232,24 +226,12 @@ namespace Plugins {
+ #ifdef __FreeBSD__
+                               if (!shared_lib_) FindLibrary("python3.7m", true);
+                               if (!shared_lib_) FindLibrary("python3.6m", true);
+@@ -271,24 +263,12 @@
                                                library = "lib" + sLibrary + ".so";
                                                shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
                                        }
@@ -61,7 +65,7 @@ index 25c83f034..ecf19da09 100644
                                        // look in /usr/local/lib directory (handles build from source)
                                        if (!shared_lib_)
                                        {
-@@ -257,12 +239,6 @@ namespace Plugins {
+@@ -296,12 +276,6 @@
                                                shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
  
                                        }
@@ -71,6 +75,6 @@ index 25c83f034..ecf19da09 100644
 -                                              library = "/usr/local/lib/lib" + sLibrary + "m.so";
 -                                              shared_lib_ = dlopen(library.c_str(), RTLD_LAZY | RTLD_GLOBAL);
 -                                      }
-                               }
-                               else
-                               {
+                                       // MacOS
+                                       // look for .dylib in /usr/local/lib
+                                       if (!shared_lib_)