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

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

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-11-23 17:54:59 +03:00
parent 83436c61a3
commit f6d21e0800
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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> 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 Subject: [PATCH] Build and use one version of preprocessor library
--- ---
octoprint_m33fio/__init__.py | 66 +----------------------------------------- octoprint_m33fio/__init__.py | 67 ++----------------------------------------
shared library source/Makefile | 59 +++---------------------------------- shared library source/Makefile | 62 +++-----------------------------------
2 files changed, 5 insertions(+), 120 deletions(-) 2 files changed, 6 insertions(+), 123 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 da539f5..b0a17ad 100755 index f9f84c4..b365024 100755
--- a/octoprint_m33fio/__init__.py --- a/octoprint_m33fio/__init__.py
+++ b/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 # 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 :
@ -81,19 +81,20 @@ index da539f5..b0a17ad 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")
+ 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 # 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 a43d657..0b254aa 100755 index 887899b..4c74f5c 100755
--- a/shared library source/Makefile --- a/shared library source/Makefile
+++ b/shared library source/Makefile +++ b/shared library source/Makefile
@@ -1,62 +1,11 @@ @@ -1,68 +1,14 @@
# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64 -# Target platform options: LINUX32, LINUX64, WINDOWS32, WINDOWS64, PI, PI2, ARM7, OSX32, OSX64
-LIBRARY_NAME = preprocessor -LIBRARY_NAME = preprocessor
-TARGET_PLATFORM = LINUX64
+LIBRARY_NAME = libpreprocessor +LIBRARY_NAME = libpreprocessor
TARGET_PLATFORM = LINUX64
VER = .1 VER = .1
-ifeq ($(TARGET_PLATFORM), LINUX32) -ifeq ($(TARGET_PLATFORM), LINUX32)
@ -122,19 +123,19 @@ index a43d657..0b254aa 100755
- -
-ifeq ($(TARGET_PLATFORM), PI) -ifeq ($(TARGET_PLATFORM), PI)
- PROG = $(LIBRARY_NAME)_arm1176jzf-s.so - 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++ - CFLAGS = -fPIC -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif -endif
- -
-ifeq ($(TARGET_PLATFORM), PI2) -ifeq ($(TARGET_PLATFORM), PI2)
- PROG = $(LIBRARY_NAME)_arm_cortex-a7.so - 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++ - CFLAGS = -fPIC -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif -endif
- -
-ifeq ($(TARGET_PLATFORM), ARM7) -ifeq ($(TARGET_PLATFORM), ARM7)
- PROG = $(LIBRARY_NAME)_arm7.so - 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++ - CFLAGS = -fPIC -mcpu=generic-armv7-a -mfpu=vfp -mfloat-abi=hard -static-libgcc -O3 -Wl,-soname,$(PROG)$(VER) -static-libstdc++
-endif -endif
- -
@ -151,11 +152,17 @@ index a43d657..0b254aa 100755
- CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER) - CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
-endif -endif
+PROG = $(LIBRARY_NAME).so +PROG = $(LIBRARY_NAME).so
+CC = g++
+CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER) +CFLAGS = -fPIC -O3 -Wl,-soname,$(PROG)$(VER)
SRCS = preprocessor.cpp gcode.cpp vector.cpp SRCS = preprocessor.cpp gcode.cpp vector.cpp
CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared 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

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.7"; version = "1.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "donovan6000"; owner = "donovan6000";
repo = "M33-Fio"; repo = "M33-Fio";
rev = "V${version}"; rev = "V${version}";
sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp"; sha256 = "11nbsi93clrqlnmaj73ak87hkqyghybccqz5jzhn2dhp0263adhl";
}; };
patches = [ patches = [