Sync upstream

Author: markqvist

LXST/Filters.py

@@ -16,11 +16,16 @@
         ffi = FFI()
 
         try:
-            filterlib_spec = find_spec("LXST.filterlib")
-            if not filterlib_spec or filterlib_spec.origin == None: raise ImportError("Could not locate pre-compiled LXST.filterlib module")
-            with open(os.path.join(c_src_path, "Filters.h"), "r") as f: ffi.cdef(f.read())
-            native_functions = ffi.dlopen(filterlib_spec.origin)
-            USE_NATIVE_FILTERS = True
+            # Disable native filterlib loading on Windows
+            # for now due to strange linking behaviour,
+            # but allow local compilation if the user has
+            # a C compiler installed.
+            if not RNS.vendor.platformutils.is_windows():
+                filterlib_spec = find_spec("LXST.filterlib")
+                if not filterlib_spec or filterlib_spec.origin == None: raise ImportError("Could not locate pre-compiled LXST.filterlib module")
+                with open(os.path.join(c_src_path, "Filters.h"), "r") as f: ffi.cdef(f.read())
+                native_functions = ffi.dlopen(filterlib_spec.origin)
+                USE_NATIVE_FILTERS = True
 
         except Exception as e:
             RNS.log(f"Could not load pre-compiled LXST filters library. The contained exception was: {e}", RNS.LOG_WARNING)

Makefile

@@ -24,7 +24,7 @@ build_wheel:
 	python3 setup.py sdist bdist_wheel
 	rm ./skip_extensions
 	-@(rm ./LXST/*.so)
-	-@(rm ./LXST/*.dll)
+	-@(rm ./LXST/*.pyd)
 
 native_libs:
 	./march_build.sh

lib/static/filterlib.cp311-win_amd64.pyd

@@ -35,8 +35,7 @@
     "Filters.h",
     "Filters.c",
     "filterlib*.so",
-    "filterlib*.dll",
-    "filterlib*.dylib",
+    "filterlib*.pyd",
     ]
 }