public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octoprint-plugins.m33-fio: 1.20 -> 1.21

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-09-28 00:21:19 +03:00
parent d0435ba032
commit c766092193
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/misc/octoprint/m33-fio-one-library.patch
View File

@ -1,18 +1,18 @@
From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001 From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me> From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 23 Nov 2016 00:40:48 +0300 Date: Wed, 23 Nov 2016 00:40:48 +0300
Subject: [PATCH] Build and use one version of preprocessor library Subject: [PATCH] Build and use one version of preprocessor library
--- ---
octoprint_m33fio/__init__.py | 67 ++---------------------------------------- octoprint_m33fio/__init__.py | 73 ++----------------------------------------
shared library source/Makefile | 62 +++----------------------------------- shared library source/Makefile | 62 +++--------------------------------
2 files changed, 6 insertions(+), 123 deletions(-) 2 files changed, 6 insertions(+), 129 deletions(-)
diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
index 4b43c59..d1259e4 100755 index 054870a..4d5ecc1 100755
--- a/octoprint_m33fio/__init__.py --- a/octoprint_m33fio/__init__.py
+++ b/octoprint_m33fio/__init__.py +++ b/octoprint_m33fio/__init__.py
@@ -1062,71 +1062,8 @@ class M33FioPlugin( @@ -1189,78 +1189,9 @@ class M33FioPlugin(
# Check if using shared library or checking if it is usable # Check if using shared library or checking if it is usable
if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable : if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
@ -54,7 +54,9 @@ index 4b43c59..d1259e4 100755
- -
- # Otherwise check if running on Windows and using an i386 or x86-64 device - # Otherwise check if running on Windows and using an i386 or x86-64 device
- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) : - elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
- + # Set shared library
+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
- # Check if Python is running as 32-bit - # Check if Python is running as 32-bit
- if platform.architecture()[0].startswith("32") : - if platform.architecture()[0].startswith("32") :
- -
@ -81,11 +83,16 @@ index 4b43c59..d1259e4 100755
- -
- # Set shared library - # Set shared library
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib") - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
+ # Set shared library -
+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so") - # Otherwise check if running FreeBSD
- elif platform.uname()[0].startswith("FreeBSD") :
-
- # TODO: Compile FreeBSD shared library pre-processors
- pass
-
# Check if shared library was set # Check if shared library was set
if self.sharedLibrary : if self.sharedLibrary :
diff --git a/shared library source/Makefile b/shared library source/Makefile diff --git a/shared library source/Makefile b/shared library source/Makefile
index 792b4f4..4c74f5c 100755 index 792b4f4..4c74f5c 100755
--- a/shared library source/Makefile --- a/shared library source/Makefile
@ -164,5 +171,5 @@ index 792b4f4..4c74f5c 100755
clean: clean:
rm -f ../octoprint_m33fio/static/libraries/$(PROG) rm -f ../octoprint_m33fio/static/libraries/$(PROG)
-- --
2.11.0 2.14.1

4
pkgs/applications/misc/octoprint/plugins.nix
View File

@ -12,13 +12,13 @@ let
m33-fio = buildPlugin rec { m33-fio = buildPlugin rec {
name = "M33-Fio-${version}"; name = "M33-Fio-${version}";
version = "1.20"; version = "1.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "donovan6000"; owner = "donovan6000";
repo = "M33-Fio"; repo = "M33-Fio";
rev = "V${version}"; rev = "V${version}";
sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767"; sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7";
}; };
patches = [ patches = [