Commit 1cc4aab7 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-release_2.17.0'

parents df1fc855 ca592f6f
Pipeline #3557 failed with stage
in 103 minutes and 44 seconds
...@@ -48,7 +48,9 @@ nwjsver = 0.28.1 ...@@ -48,7 +48,9 @@ nwjsver = 0.28.1
nwjspkg = nwjs-sdk-v$(nwjsver)-linux nwjspkg = nwjs-sdk-v$(nwjsver)-linux
nwjsver_arm = 0.27.6 nwjsver_arm = 0.27.6
nwjspkg_arm = nwjs-sdk-v$(nwjsver_arm)-linux 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, etc.). You can list them with 'make submodules'.
#submodules = Gem externals/miXed $(addprefix l2ork_addons/, cwiid fftease3.0-32bit lyonpotpourri rtcmix-in-pd) #submodules = Gem externals/miXed $(addprefix l2ork_addons/, cwiid fftease3.0-32bit lyonpotpourri rtcmix-in-pd)
...@@ -117,5 +119,8 @@ $(debsrc): ...@@ -117,5 +119,8 @@ $(debsrc):
debian/nwjs/$(nwjspkg_arm)-arm.tar.gz: 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 $@) 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: debian/nwjs/$(nwjspkg)-%.tar.gz:
mkdir -p debian/nwjs && cd debian/nwjs && wget http://dl.nwjs.io/v$(nwjsver)/$(notdir $@) mkdir -p debian/nwjs && cd debian/nwjs && wget http://dl.nwjs.io/v$(nwjsver)/$(notdir $@)
...@@ -6,13 +6,15 @@ ...@@ -6,13 +6,15 @@
nwjsver = 0.28.1 nwjsver = 0.28.1
nwjspkg = nwjs-sdk-v$(nwjsver)-linux nwjspkg = nwjs-sdk-v$(nwjsver)-linux
nwjsdir = nwjs-sdk-v$(nwjsver)-linux
ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","armhf") ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","armhf")
arch = arm arch = arm
nwjsver = 0.27.6 nwjsver = 0.27.6
else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","arm64") else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","arm64")
arch = arm arch = arm64
nwjsver = 0.27.6 nwjsver = 0.23.7
nwjspkg = nwjs-sdk-without-nacl-v$(nwjsver)-linux
else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","amd64") else ifeq ("$(shell dpkg-architecture -qDEB_HOST_ARCH)","amd64")
arch = x64 arch = x64
else else
...@@ -41,7 +43,7 @@ override_dh_auto_test: ...@@ -41,7 +43,7 @@ override_dh_auto_test:
override_dh_auto_build: override_dh_auto_build:
# Copy the nw.js sources to where purr-data wants them. # Copy the nw.js sources to where purr-data wants them.
@echo "DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)" @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) cd l2ork_addons && (export V=0 inst_dir=$(prefix); ./tar_em_up.sh -Bn)
make check prefix=$(prefix) make check prefix=$(prefix)
...@@ -59,6 +61,10 @@ ifeq ($(arch),ia32) ...@@ -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. # 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 cd debian/purr-data$(prefix)/lib/pd-l2ork && rm -rf bin/nw/minidump_stackwalk
endif 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. # Add the bash completion file again, and edit it accordingly.
mkdir -p debian/purr-data/etc/bash_completion.d 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 sed -e 's/pd-l2ork/purr-data/g' < scripts/bash_completion/pd-l2ork > debian/purr-data/etc/bash_completion.d/purr-data
......
...@@ -124,7 +124,7 @@ mark.console_find_highlighted { ...@@ -124,7 +124,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: #7c71da;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -237,7 +237,7 @@ mark.console_find_highlighted { ...@@ -237,7 +237,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: black;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -118,7 +118,7 @@ mark.console_find_highlighted { ...@@ -118,7 +118,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: black;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -236,7 +236,7 @@ mark.console_find_highlighted { ...@@ -236,7 +236,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: black;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -133,7 +133,7 @@ mark.console_find_highlighted { ...@@ -133,7 +133,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: white;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -127,7 +127,7 @@ mark.console_find_highlighted { ...@@ -127,7 +127,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: #073642;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -127,7 +127,7 @@ mark.console_find_highlighted { ...@@ -127,7 +127,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: #839496;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -124,7 +124,7 @@ mark.console_find_highlighted { ...@@ -124,7 +124,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: #53b83b;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -124,7 +124,7 @@ mark.console_find_highlighted { ...@@ -124,7 +124,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: black; fill: #333333;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -118,7 +118,7 @@ mark.console_find_highlighted { ...@@ -118,7 +118,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: black;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -124,7 +124,7 @@ mark.console_find_highlighted { ...@@ -124,7 +124,7 @@ mark.console_find_highlighted {
} }
#svg_fg { #svg_fg {
fill: #bbb; fill: white;
} }
#selection_rectangle { #selection_rectangle {
......
...@@ -14,7 +14,7 @@ extern "C" { ...@@ -14,7 +14,7 @@ extern "C" {
#define PD_MINOR_VERSION 48 #define PD_MINOR_VERSION 48
#define PD_BUGFIX_VERSION 0 #define PD_BUGFIX_VERSION 0
#define PD_TEST_VERSION "" #define PD_TEST_VERSION ""
#define PD_L2ORK_VERSION "2.16.0" #define PD_L2ORK_VERSION "2.17.0"
#define PDL2ORK #define PDL2ORK
extern int pd_compatibilitylevel; /* e.g., 43 for pd 0.43 compatibility */ extern int pd_compatibilitylevel; /* e.g., 43 for pd 0.43 compatibility */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment