octoprint-plugins.m33-fio: 1.7 -> 1.11

2 files changed, 26 insertions, 19 deletions

diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index 968983696fe..cbfb6111ec5 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@@ -1,18 +1,18 @@
-From 62b4fabd1d4ee7a584a565d48c7eaec6e80fe0bd Mon Sep 17 00:00:00 2001
+From c84b2130dab0d26be35294d023ed8f4be404c3c1 Mon Sep 17 00:00:00 2001
 From: Nikolay Amiantov <ab@fmap.me>
-Date: Fri, 12 Aug 2016 23:41:22 +0300
+Date: Wed, 23 Nov 2016 00:40:48 +0300
 Subject: [PATCH] Build and use one version of preprocessor library
 
 ---
- octoprint_m33fio/__init__.py   | 66 +-----------------------------------------
- shared library source/Makefile | 59 +++----------------------------------
- 2 files changed, 5 insertions(+), 120 deletions(-)
+ octoprint_m33fio/__init__.py   | 67 ++----------------------------------------
+ shared library source/Makefile | 62 +++-----------------------------------
+ 2 files changed, 6 insertions(+), 123 deletions(-)
 
 diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index da539f5..b0a17ad 100755
+index f9f84c4..b365024 100755
 --- a/octoprint_m33fio/__init__.py
 +++ b/octoprint_m33fio/__init__.py
-@@ -979,71 +979,7 @@ class M33FioPlugin(
+@@ -1061,71 +1061,8 @@ class M33FioPlugin(
  		# Check if using shared library or checking if it is usable
  		if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
  	
@@ -81,19 +81,20 @@ index da539f5..b0a17ad 100755
 -	
 -					# 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/libpreprocessor.so")
++                        # Set shared library
++                        self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
  
  			# Check if shared library was set
  			if self.sharedLibrary :
 diff --git a/shared library source/Makefile b/shared library source/Makefile
-index a43d657..0b254aa 100755
+index 887899b..4c74f5c 100755
 --- a/shared library source/Makefile	
 +++ b/shared library source/Makefile	
-@@ -1,62 +1,11 @@
- # Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
+@@ -1,68 +1,14 @@
+-# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
 -LIBRARY_NAME = preprocessor
+-TARGET_PLATFORM = LINUX64
 +LIBRARY_NAME = libpreprocessor
- TARGET_PLATFORM = LINUX64
  VER = .1
  
 -ifeq ($(TARGET_PLATFORM), LINUX32)
@@ -122,19 +123,19 @@ index a43d657..0b254aa 100755
 -
 -ifeq ($(TARGET_PLATFORM), PI)
 -	PROG = $(LIBRARY_NAME)_arm1176jzf-s.so
--	CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
+-	CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
 -	CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
 -endif
 -
 -ifeq ($(TARGET_PLATFORM), PI2)
 -	PROG = $(LIBRARY_NAME)_arm_cortex-a7.so
--	CC = ~/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
+-	CC = /opt/arm-toolchain/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-g++
 -	CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
 -endif
 -
 -ifeq ($(TARGET_PLATFORM), ARM7)
 -	PROG = $(LIBRARY_NAME)_arm7.so
--	CC = ~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++
+-	CC = /opt/arm-toolchain/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-g++
 -	CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
 -endif
 -
@@ -151,11 +152,17 @@ index a43d657..0b254aa 100755
 -	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
 -endif
 +PROG = $(LIBRARY_NAME).so
-+CC = g++
 +CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER)
  
  SRCS = preprocessor.cpp gcode.cpp vector.cpp
  CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared
+ 
+ all:
+-	$(CC) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
++	$(CXX) $(CFLAGS) -o ../octoprint_m33fio/static/libraries/$(PROG) $(SRCS)
+ 
+ clean:
+ 	rm -f ../octoprint_m33fio/static/libraries/$(PROG)
 -- 
-2.9.2
+2.10.2
 
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 09f9e654b94..8f015245763 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,13 +12,13 @@ let
 
     m33-fio = buildPlugin rec {
       name = "M33-Fio-${version}";
-      version = "1.7";
+      version = "1.11";
 
       src = fetchFromGitHub {
         owner = "donovan6000";
         repo = "M33-Fio";
         rev = "V${version}";
-        sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp";
+        sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl";
       };
 
       patches = [