[SCM] pd-bsaylor/master: Upstream patches for 64bit compatibility

umlaeute at users.alioth.debian.org umlaeute at users.alioth.debian.org
Mon Feb 22 19:26:46 UTC 2016


The following commit has been merged in the master branch:
commit 0eb49781bf4a1b1b2f9ac0e9af5834ba7c0a1483
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Mon Feb 22 20:00:19 2016 +0100

    Upstream patches for 64bit compatibility
    
    Closes #792717

diff --git a/debian/patches/64bit_fixes.patch b/debian/patches/64bit_fixes.patch
new file mode 100644
index 0000000..9216e90
--- /dev/null
+++ b/debian/patches/64bit_fixes.patch
@@ -0,0 +1,65 @@
+Description: 64bit-save array access
+Origin: https://svn.code.sf.net/p/pure-data/svn/trunk/externals/bsaylor@17463
+Last-Update: 2016-02-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- pd-bsaylor.orig/partconv~.c
++++ pd-bsaylor/partconv~.c
+@@ -252,7 +252,7 @@
+ 	int i;
+ 	int j;
+ 	t_garray *arrayobj;
+-	t_float *array;
++	t_word *array;
+ 	int arraysize;
+ 	int arraypos;
+ 
+@@ -263,7 +263,7 @@
+ 			pd_error(x, "partconv~: %s: no such array", x->arrayname->s_name);
+ 			return;
+ 		}
+-	} else if ( ! garray_getfloatarray(arrayobj, &arraysize, &array)) {
++	} else if ( ! garray_getfloatwords(arrayobj, &arraysize, &array)) {
+ 		pd_error(x, "%s: bad template", x->arrayname->s_name);
+ 		return;
+ 	}
+@@ -286,7 +286,7 @@
+ 		x->irpart_fd[i] = (fftwf_complex *) x->irpart_td[i];
+ 		x->irpart_plan = fftwf_plan_dft_r2c_1d(x->fftsize, x->irpart_td[i], x->irpart_fd[i], FFTW_MEASURE);
+ 		for (j = 0; j < x->partsize && arraypos < arraysize; j++, arraypos++) {
+-			x->irpart_td[i][j] = array[arraypos];
++			x->irpart_td[i][j] = array[arraypos].w_float;
+ 		}
+ 		for ( ; j < x->paddedsize; j++) {
+ 			x->irpart_td[i][j] = 0;
+--- pd-bsaylor.orig/pvoc~.c
++++ pd-bsaylor/pvoc~.c
+@@ -47,7 +47,7 @@
+ 	t_object x_obj;
+ 	t_symbol *arrayname;
+ 	t_garray *arrayobj;
+-	t_float *array;
++	t_word *array;
+ 	int arraysize;
+ 	double *window;
+ 	int fftsize;
+@@ -90,8 +90,8 @@
+ 		return 0.0;
+ 	else {
+ 		int x_1 = t;
+-		double y_1 = x->array[x_1];
+-		double y_2 = x->array[x_1 + 1];
++		double y_1 = x->array[x_1].w_float;
++		double y_2 = x->array[x_1 + 1].w_float;
+ 
+ 		return (y_2 - y_1) * (t - x_1) + y_1;
+ 	}
+@@ -281,7 +281,7 @@
+  		if (*x->arrayname->s_name) pd_error(x, "pvoc~: %s: no such array", x->arrayname->s_name);
+ 		x->array = NULL;
+ 		x->arraysize = 0;
+-	} else if ( ! garray_getfloatarray(x->arrayobj, &x->arraysize, &x->array)) {
++	} else if ( ! garray_getfloatwords(x->arrayobj, &x->arraysize, &x->array)) {
+  		error("%s: bad template", x->arrayname->s_name);
+ 		x->array = NULL;
+ 		x->arraysize = 0;
diff --git a/debian/patches/series b/debian/patches/series
index a4ea679..54d9c40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+64bit_fixes.patch
 nonlinux_fixes.patch

-- 
pd-bsaylor packaging



More information about the pkg-multimedia-commits mailing list