Merge branch '2.19.4-release' into 'master'

2.19.4 release (candidate)

See merge request jwilkes/purr-data!867

Author: Jonathan Wilkes

.gitmodules

@@ -6,10 +6,10 @@
 	url = https://github.com/pd-l2ork/cwiid
 [submodule "Gem"]
 	path = Gem
-	url = https://git.purrdata.net/aggraef/gem.git
+	url = https://github.com/agraef/Gem.git
 [submodule "l2ork_addons/raspberry_pi/disis_gpio/wiringPi"]
 	path = l2ork_addons/raspberry_pi/disis_gpio/wiringPi
 	url = https://git.purrdata.net/jwilkes/wiringPi.git
 [submodule "externals/pd-lua"]
 	path = externals/pd-lua
-	url = https://git.purrdata.net/jwilkes/pd-lua.git
+	url = https://github.com/agraef/pd-lua.git

LICENSE.html

@@ -1,6 +1,6 @@
-# Pd-l2ork Copyright and Terms of Use
+# Purr-Data Copyright and Terms of Use
 
-Pd, as well as this compilation of Pd-related software known as Purr Data
+Pd, as well as this compilation of Pd-related software known as Purr-Data
 a.k.a. Pd-l2ork 2.x, is copyrighted software by various authors, but it is
 distributed as open-source software, which means that it can be used freely
 and without any costs under the appropriate license terms, as detailed below.
@@ -32,21 +32,21 @@ for details.
 Copyright (c) by various authors, please see the included license files for
 details
 
-Pd-l2ork includes a large number of bundled abstractions and externals by
+Purr-Data includes a large number of bundled abstractions and externals by
 various authors. These can be found in the abstractions, externals and Gem
-subdirectories in the source, and in the extra subdirectory of the Pd-l2ork
+subdirectories in the source, and in the extra subdirectory of the Purr-Data
 library directory of the installed application. Each of these items has its
 own open-source license under which it is distributed (mostly different
 variations of the BSD license or the GPL), so please check the corresponding
 license files in the source or the extra directory of the installed package
 for license information pertaining to each of the different software modules.
 
-## Pd-l2ork License
+## Purr-Data License
 
 Copyright (c) by Hans-Christoph Steiner, Ico Bukvic, Jonathan Wilkes and
 others
 
-Purr Data (by Jonathan Wilkes) is based on Pd-l2ork (by Ico Bukvic) which in
+Purr-Data (by Jonathan Wilkes) is based on Pd-l2ork (by Ico Bukvic) which in
 turn is based on Pd-extended (by Hans-Christoph Steiner), which is licensed
 under the GPL (GNU Public License) version 3, replicated below. Please note
 that this license applies to all parts of this package which are *not*

LICENSE.md

@@ -95,6 +95,16 @@ endif
 
 install_vars = DESTDIR=$(firstword $(wildcard $(CURDIR)/packages/*/build)) prefix=$(prefix)
 
+# You can set the nwjsver variable to indicate the nw.js version to build
+# against. This will also clear out any cached nw.js binaries beforehand.
+# Note that some nw.js versions for certain platforms have to be hard-coded,
+# so the nwjsver variable won't affect these, but it will still cause the
+# cache to be cleared and the binaries to be downloaded. See the tar_em_up.sh
+# script for details.
+ifneq ($(nwjsver),)
+env += nwjsver="$(nwjsver)"
+endif
+
 # You can set CFLAGS to whatever special compile options are needed. E.g., to
 # build the double precision version: CFLAGS = -DPD_FLOATSIZE=64
 CFLAGS =

Makefile

@@ -50,7 +50,7 @@ debdist = purr-data-$(debversion)
 # nw.js sdk
 # NOTE: arm packages need some special-casing, since they are released
 # separately, and the version numbers do not always match up.
-nwjsver = 0.28.3
+nwjsver = 0.55.0
 nwjspkg = nwjs-sdk-v$(nwjsver)-linux
 nwjsver_arm = 0.27.6
 nwjspkg_arm = nwjs-sdk-v$(nwjsver_arm)-linux

debuild/Makefile

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-nwjsver = 0.28.3
+nwjsver = 0.55.0
 nwjspkg = nwjs-sdk-v$(nwjsver)-linux
 nwjsdir = nwjs-sdk-v$(nwjsver)-linux
 
@@ -73,14 +73,6 @@ endif
 	sed -e 's/pd-l2ork/purr-data/g' < scripts/bash_completion/pd-l2ork > debian/purr-data/etc/bash_completion.d/purr-data
 # Edit the library paths in the default user.settings file.
 	cd debian/purr-data$(prefix)/lib/pd-l2ork && sed -e "s!/usr/lib/pd-l2ork!$(prefix)/lib/pd-l2ork!g" -i default.settings
-# Sanitize permissions.
-	cd debian/purr-data && chmod -R go-w * && chmod -R a+r * && chmod a-x .$(prefix)/lib/pd-l2ork/default.settings
-	find debian/purr-data$(prefix)/lib/pd-l2ork/bin/nw -executable -not -type d | xargs chmod a+x
-	find debian/purr-data -executable -name '*.pd_linux' | xargs chmod a-x
-	find debian/purr-data -executable -name '*.pd' | xargs chmod a-x
-	find debian/purr-data -executable -name '*.txt' | xargs chmod a-x
-	find debian/purr-data -executable -name '*.aif*' | xargs chmod a-x
-	find debian/purr-data -type d | xargs chmod a+x
 
 # NOTE: Older systems use dh_pysupport instead of dh_python2. See
 # http://deb.li/dhs2p.

debuild/debian/rules

@@ -138,7 +138,7 @@ static int unixinitudp(int chan)
 	if((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
 
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sun_family = AF_UNIX;
 	strcpy(serv_addr.sun_path, UNIXDG_PATH);
 	sprintf(serv_addr.sun_path+strlen(serv_addr.sun_path), "%d", chan);
@@ -160,7 +160,7 @@ static int initudp(int chan)
 
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(chan);

externals/OSCx/send+dump/dumpOSC.c

@@ -92,7 +92,7 @@ static int initudp(int port) {
 
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(port);

externals/OSCx/send+dump/dumpUDP.c

@@ -133,7 +133,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 		         * server that we want to send to.
 		*/
 
-		bzero((char *) &o->userv_addr, sizeof(o->userv_addr));
+		memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
 		       o->userv_addr.sun_family = AF_UNIX;
 		strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
 			sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
@@ -152,7 +152,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 			 * pathname, based on our process id.
 			 */
 
-			bzero((char *) &ucl_addr, sizeof(ucl_addr));    /* zero out */
+			memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
 			ucl_addr.sun_family = AF_UNIX;
 			strcpy(ucl_addr.sun_path, UNIXDG_TMP);
 
@@ -183,7 +183,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 		#ifdef WIN32
 			ZeroMemory((char *)&o->serv_addr, sizeof(o->serv_addr));
 		#else
-			bzero((char *)&o->serv_addr, sizeof(o->serv_addr));
+			memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
 		#endif
 
 		o->serv_addr.sin_family = AF_INET;
@@ -243,7 +243,7 @@ void *OpenHTMSocket(char *host, int portnumber)
 			o->serv_addr.sin_port = htons(portnumber);
 			o->addr = &(o->serv_addr);
 			if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
-					bzero((char *)&cl_addr, sizeof(cl_addr));
+					memset((char *)&cl_addr, 0, sizeof(cl_addr));
 				cl_addr.sin_family = AF_INET;
 				cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 				cl_addr.sin_port = htons(0);

externals/OSCx/send+dump/htmsocket.c

@@ -313,7 +313,7 @@ static void *dumpOSC_new(t_symbol *compatflag,
       int t = 1;
 	  mreq.imr_multiaddr.s_addr = inet_addr(castgroup->s_name);
 	  mreq.imr_interface.s_addr = htonl(INADDR_ANY);
-      if (setsockopt(sockfd,SOL_SOCKET,SO_REUSEADDR,&t,sizeof(t)) < 0) {
+      if (setsockopt(sockfd,SOL_SOCKET,SO_REUSEADDR,(char*)&t,sizeof(t)) < 0) {
 		  sys_sockerror("setsockopt");
       }
 	  if (setsockopt(sockfd,IPPROTO_IP,IP_ADD_MEMBERSHIP,(char*)&mreq,sizeof(mreq)) < 0) {
@@ -400,7 +400,7 @@ void dumpOSC_setup(void)
 		if((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
 				return sockfd;
 
-		bzero((char *)&serv_addr, sizeof(serv_addr));
+		memset((char *)&serv_addr, 0, sizeof(serv_addr));
 		serv_addr.sun_family = AF_UNIX;
 		strcpy(serv_addr.sun_path, UNIXDG_PATH);
 		sprintf(serv_addr.sun_path+strlen(serv_addr.sun_path), "%d", chan);
@@ -448,7 +448,7 @@ static int initudp(int chan)
 	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return sockfd;
 
-	bzero((char *)&serv_addr, sizeof(serv_addr));
+	memset((char *)&serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 	serv_addr.sin_port = htons(chan);