diff --git a/debuild/Makefile b/debuild/Makefile
index 3895b7d3643579cbf874f2645950f3cbe70046d2..053f9746fddfd7b068c89bacfdf8f0b236e50907 100644
--- a/debuild/Makefile
+++ b/debuild/Makefile
@@ -48,7 +48,9 @@ nwjsver = 0.28.1
nwjspkg = nwjs-sdk-v$(nwjsver)-linux
nwjsver_arm = 0.27.6
nwjspkg_arm = nwjs-sdk-v$(nwjsver_arm)-linux
-nwjs = $(nwjspkg)-ia32.tar.gz $(nwjspkg)-x64.tar.gz $(nwjspkg_arm)-arm.tar.gz
+nwjsver_arm64 = 0.23.7
+nwjspkg_arm64 = nwjs-sdk-without-nacl-v$(nwjsver_arm64)-linux
+nwjs = $(nwjspkg)-ia32.tar.gz $(nwjspkg)-x64.tar.gz $(nwjspkg_arm)-arm.tar.gz $(nwjspkg_arm64)-arm64.tar.gz
# Submodules (Gem, etc.). You can list them with 'make submodules'.
#submodules = Gem externals/miXed $(addprefix l2ork_addons/, cwiid fftease3.0-32bit lyonpotpourri rtcmix-in-pd)
@@ -117,5 +119,8 @@ $(debsrc):
debian/nwjs/$(nwjspkg_arm)-arm.tar.gz:
mkdir -p debian/nwjs && cd debian/nwjs && wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/v$(nwjsver_arm)/$(notdir $@)
+debian/nwjs/$(nwjspkg_arm64)-arm64.tar.gz:
+ mkdir -p debian/nwjs && cd debian/nwjs && wget https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/v$(nwjsver_arm64)/$(notdir $@)
+
debian/nwjs/$(nwjspkg)-%.tar.gz:
mkdir -p debian/nwjs && cd debian/nwjs && wget http://dl.nwjs.io/v$(nwjsver)/$(notdir $@)
diff --git a/debuild/debian/rules b/debuild/debian/rules
index 5cf265d2b8eac2e657667ffbc5a60e8deccab8c2..d8c498f3f007b25e07521b149956bd167a71ae33 100755
--- a/debuild/debian/rules
+++ b/debuild/debian/rules
@@ -6,13 +6,15 @@
nwjsver = 0.28.1
nwjspkg = nwjs-sdk-v$(nwjsver)-linux
+nwjsdir = nwjs-sdk-v$(nwjsver)-linux
ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","armhf")
arch = arm
nwjsver = 0.27.6
else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","arm64")
-arch = arm
-nwjsver = 0.27.6
+arch = arm64
+nwjsver = 0.23.7
+nwjspkg = nwjs-sdk-without-nacl-v$(nwjsver)-linux
else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","amd64")
arch = x64
else
@@ -41,7 +43,7 @@ override_dh_auto_test:
override_dh_auto_build:
# Copy the nw.js sources to where purr-data wants them.
@echo "DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)"
- tar -xf debian/nwjs/$(nwjspkg)-$(arch).tar.gz && rm -rf pd/nw/nw && mv $(nwjspkg)-$(arch) pd/nw/nw
+ tar -xf debian/nwjs/$(nwjspkg)-$(arch).tar.gz && rm -rf pd/nw/nw && mv $(nwjsdir)-$(arch) pd/nw/nw
cd l2ork_addons && (export V=0 inst_dir=$(prefix); ./tar_em_up.sh -Bn)
make check prefix=$(prefix)
@@ -59,6 +61,10 @@ ifeq ($(arch),ia32)
# This causes trouble in 32 bit builds (64 bit executable in the 32 bit nw.js distribution?), remove it.
cd debian/purr-data$(prefix)/lib/pd-l2ork && rm -rf bin/nw/minidump_stackwalk
endif
+ifeq ($(arch),arm64)
+# Same issue in arm64 builds.
+ cd debian/purr-data$(prefix)/lib/pd-l2ork && rm -rf bin/nw/minidump_stackwalk
+endif
# Add the bash completion file again, and edit it accordingly.
mkdir -p debian/purr-data/etc/bash_completion.d
sed -e 's/pd-l2ork/purr-data/g' < scripts/bash_completion/pd-l2ork > debian/purr-data/etc/bash_completion.d/purr-data
diff --git a/pd/nw/css/c64.css b/pd/nw/css/c64.css
index 1fad0484181fcf292791c40c7e422d2f4bdd1144..49cce87dd372c82aecb19305d5bce3b16bb8aa96 100644
--- a/pd/nw/css/c64.css
+++ b/pd/nw/css/c64.css
@@ -124,7 +124,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: #7c71da;
}
#selection_rectangle {
diff --git a/pd/nw/css/default.css b/pd/nw/css/default.css
index db0bf626c874555ea8f0cf1a06210486bb0ba2a9..01ff5eab86ace0c58abe1ebc5934c5c5826a70fa 100644
--- a/pd/nw/css/default.css
+++ b/pd/nw/css/default.css
@@ -237,7 +237,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: black;
}
#selection_rectangle {
diff --git a/pd/nw/css/extended.css b/pd/nw/css/extended.css
index 2df74176f8375f52c594137fab6f6de3aa6d66ab..a45d36315e61c7a2c8b5eae62967b58736db184a 100644
--- a/pd/nw/css/extended.css
+++ b/pd/nw/css/extended.css
@@ -118,7 +118,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: black;
}
#selection_rectangle {
diff --git a/pd/nw/css/footgun.css b/pd/nw/css/footgun.css
index 7accb701b4d538157a8e320fa9a94bfee4bacad1..73239eaa2847f1fa4bb479ce572166b236e70f32 100644
--- a/pd/nw/css/footgun.css
+++ b/pd/nw/css/footgun.css
@@ -236,7 +236,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: black;
}
#selection_rectangle {
diff --git a/pd/nw/css/inverted.css b/pd/nw/css/inverted.css
index 48b2013c348523d4f3ab5262ea24a66cad805890..1e1e127f395046772f5ae3f6bba2412e72aa4251 100644
--- a/pd/nw/css/inverted.css
+++ b/pd/nw/css/inverted.css
@@ -133,7 +133,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: white;
}
#selection_rectangle {
diff --git a/pd/nw/css/solarized.css b/pd/nw/css/solarized.css
index b33adee3f7a54f2286d5085abc461875cca3a83d..0fdf9157d6ec8f42cb447cdac897f7c1a1e9ae67 100644
--- a/pd/nw/css/solarized.css
+++ b/pd/nw/css/solarized.css
@@ -127,7 +127,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: #073642;
}
#selection_rectangle {
diff --git a/pd/nw/css/solarized_inverted.css b/pd/nw/css/solarized_inverted.css
index b851d772f0022fb95eedd7ff7c49189ffcad007a..c255f62df46f38985af487c42d425f1bc183bb84 100644
--- a/pd/nw/css/solarized_inverted.css
+++ b/pd/nw/css/solarized_inverted.css
@@ -127,7 +127,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: #839496;
}
#selection_rectangle {
diff --git a/pd/nw/css/strongbad.css b/pd/nw/css/strongbad.css
index 576be4aa1c61df10d426c10f18d8ef43f6ba744d..50d5372addd7986700f5564a81e0b0266f75f2a6 100644
--- a/pd/nw/css/strongbad.css
+++ b/pd/nw/css/strongbad.css
@@ -124,7 +124,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: #53b83b;
}
#selection_rectangle {
diff --git a/pd/nw/css/subdued.css b/pd/nw/css/subdued.css
index d586440a76beff5a5c596524a7d845e49902e209..376b0816ca18e5f5dcee1991ca179db55a22f970 100644
--- a/pd/nw/css/subdued.css
+++ b/pd/nw/css/subdued.css
@@ -124,7 +124,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: black;
+ fill: #333333;
}
#selection_rectangle {
diff --git a/pd/nw/css/vanilla.css b/pd/nw/css/vanilla.css
index 6c79b1332bb5944a55d03efac26a8c77c168a668..0466df0704534cfb9a931e5bb5dcff24ec052c01 100644
--- a/pd/nw/css/vanilla.css
+++ b/pd/nw/css/vanilla.css
@@ -118,7 +118,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: black;
}
#selection_rectangle {
diff --git a/pd/nw/css/vanilla_inverted.css b/pd/nw/css/vanilla_inverted.css
index f9df5f071368a36cd0a3614457e5a28a579ba92b..993bdae6be3ec233f036dcb5cd9f85e3f799211c 100644
--- a/pd/nw/css/vanilla_inverted.css
+++ b/pd/nw/css/vanilla_inverted.css
@@ -124,7 +124,7 @@ mark.console_find_highlighted {
}
#svg_fg {
- fill: #bbb;
+ fill: white;
}
#selection_rectangle {
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index 58e604c9ac5a5e44caecdfb9014bee7845470cb7..e023963ed82ab660244dce2b1b53d987fa77b7b9 100644
--- a/pd/src/m_pd.h
+++ b/pd/src/m_pd.h
@@ -14,7 +14,7 @@ extern "C" {
#define PD_MINOR_VERSION 48
#define PD_BUGFIX_VERSION 0
#define PD_TEST_VERSION ""
-#define PD_L2ORK_VERSION "2.16.0"
+#define PD_L2ORK_VERSION "2.17.0"
#define PDL2ORK
extern int pd_compatibilitylevel; /* e.g., 43 for pd 0.43 compatibility */