From 6a40415e3ab3b67dc2a9515727e74307235bd839 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 21 Jul 2010 22:07:40 +0000 Subject: first big round of patches accepted by Miller into 0.43 svn path=/trunk/; revision=13724 --- .../patches/add_home_end_to_obj_boxes-0.41.4.patch | 32 --------- packages/patches/delwrite~_nogui_fix-0.42.5.patch | 75 ---------------------- .../made_print_post_all_arguments-0.40.3.patch | 30 --------- .../patches/makeversion_tweak-0.41.0-test10.patch | 23 ------- packages/patches/normalize_pd_guidir-0.40.3.patch | 25 -------- .../set_pd_window_location-0.41.0-test03.patch | 16 ----- 6 files changed, 201 deletions(-) delete mode 100644 packages/patches/add_home_end_to_obj_boxes-0.41.4.patch delete mode 100644 packages/patches/delwrite~_nogui_fix-0.42.5.patch delete mode 100644 packages/patches/made_print_post_all_arguments-0.40.3.patch delete mode 100644 packages/patches/makeversion_tweak-0.41.0-test10.patch delete mode 100644 packages/patches/normalize_pd_guidir-0.40.3.patch delete mode 100644 packages/patches/set_pd_window_location-0.41.0-test03.patch diff --git a/packages/patches/add_home_end_to_obj_boxes-0.41.4.patch b/packages/patches/add_home_end_to_obj_boxes-0.41.4.patch deleted file mode 100644 index e280d984..00000000 --- a/packages/patches/add_home_end_to_obj_boxes-0.41.4.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: u_main.tk -=================================================================== ---- u_main.tk (revision 9725) -+++ u_main.tk (working copy) -@@ -3332,7 +3332,7 @@ - # if {$font < 13} {set fontname [format -*-courier-bold----%d-* $font]} - # if {$font >= 13} {set fontname [format -*-courier-----%d-* $font]} - -- global pd_fontlist -+ global pd_fontlist pd_nt - switch -- $font { - 8 { set typeface [lindex $pd_fontlist 0] } - 9 { set typeface [lindex $pd_fontlist 1] } -@@ -3346,9 +3346,16 @@ - 36 { set typeface [lindex $pd_fontlist 9] } - } - -- $canvasname create text $x $y \ -- -font $typeface \ -+ $canvasname create text $x $y -font $typeface \ - -tags $myname -text $text -fill $color -anchor nw -+ $canvasname bind $myname [concat $canvasname icursor $myname 0] -+ $canvasname bind $myname [concat $canvasname icursor $myname end] -+ if {$pd_nt == 2} { # emacs bindings for Mac OS X -+ $canvasname bind $myname \ -+ [concat $canvasname icursor $myname 0] -+ $canvasname bind $myname \ -+ [concat $canvasname icursor $myname end] -+ } - # pd [concat $myname size [$canvasname bbox $myname] \;] - } - diff --git a/packages/patches/delwrite~_nogui_fix-0.42.5.patch b/packages/patches/delwrite~_nogui_fix-0.42.5.patch deleted file mode 100644 index d1172156..00000000 --- a/packages/patches/delwrite~_nogui_fix-0.42.5.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: d_delay.c -=================================================================== ---- d_delay.c (révision 13558) -+++ d_delay.c (copie de travail) -@@ -24,6 +24,7 @@ - { - t_object x_obj; - t_symbol *x_sym; -+ t_float x_deltime; /* delay in msec (added by Mathieu Bouchard) */ - t_delwritectl x_cspace; - int x_sortno; /* DSP sort number at which this was last put on chain */ - int x_rsortno; /* DSP sort # for first delread or write in chain */ -@@ -34,6 +35,21 @@ - #define XTRASAMPS 4 - #define SAMPBLK 4 - -+static void sigdelwrite_updatesr (t_sigdelwrite *x, t_float sr) /* added by Mathieu Bouchard */ -+{ -+ int nsamps = x->x_deltime * sr * (t_float)(0.001f); -+ if (nsamps < 1) nsamps = 1; -+ nsamps += ((- nsamps) & (SAMPBLK - 1)); -+ nsamps += DEFDELVS; -+ if (x->x_cspace.c_n != nsamps) { -+ x->x_cspace.c_vec = (t_sample *)resizebytes(x->x_cspace.c_vec, -+ (x->x_cspace.c_n + XTRASAMPS) * sizeof(t_sample), -+ ( nsamps + XTRASAMPS) * sizeof(t_sample)); -+ x->x_cspace.c_n = nsamps; -+ x->x_cspace.c_phase = XTRASAMPS; -+ } -+} -+ - /* routine to check that all delwrites/delreads/vds have same vecsize */ - static void sigdelwrite_checkvecsize(t_sigdelwrite *x, int vecsize) - { -@@ -54,19 +70,13 @@ - - static void *sigdelwrite_new(t_symbol *s, t_floatarg msec) - { -- int nsamps; - t_sigdelwrite *x = (t_sigdelwrite *)pd_new(sigdelwrite_class); - if (!*s->s_name) s = gensym("delwrite~"); - pd_bind(&x->x_obj.ob_pd, s); - x->x_sym = s; -- nsamps = msec * sys_getsr() * (t_float)(0.001f); -- if (nsamps < 1) nsamps = 1; -- nsamps += ((- nsamps) & (SAMPBLK - 1)); -- nsamps += DEFDELVS; -- x->x_cspace.c_n = nsamps; -- x->x_cspace.c_vec = -- (t_sample *)getbytes((nsamps + XTRASAMPS) * sizeof(t_sample)); -- x->x_cspace.c_phase = XTRASAMPS; -+ x->x_deltime = msec; -+ x->x_cspace.c_n = 0; -+ x->x_cspace.c_vec = getbytes(XTRASAMPS * sizeof(t_sample)); - x->x_sortno = 0; - x->x_vecsize = 0; - x->x_f = 0; -@@ -109,6 +119,7 @@ - dsp_add(sigdelwrite_perform, 3, sp[0]->s_vec, &x->x_cspace, sp[0]->s_n); - x->x_sortno = ugen_getsortno(); - sigdelwrite_checkvecsize(x, sp[0]->s_n); -+ sigdelwrite_updatesr(x, sp[0]->s_sr); - } - - static void sigdelwrite_free(t_sigdelwrite *x) -@@ -200,6 +211,7 @@ - x->x_n = sp[0]->s_n; - if (delwriter) - { -+ sigdelwrite_updatesr(delwriter, sp[0]->s_sr); - sigdelwrite_checkvecsize(delwriter, sp[0]->s_n); - x->x_zerodel = (delwriter->x_sortno == ugen_getsortno() ? - 0 : delwriter->x_vecsize); - - diff --git a/packages/patches/made_print_post_all_arguments-0.40.3.patch b/packages/patches/made_print_post_all_arguments-0.40.3.patch deleted file mode 100644 index 5abec468..00000000 --- a/packages/patches/made_print_post_all_arguments-0.40.3.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- x_interface.c 2007/11/25 03:31:05 1.3.6.1 -+++ x_interface.c 2007/12/04 21:54:46 1.3.6.3 -@@ -17,12 +17,22 @@ - - static void *print_new(t_symbol *s, int argc, t_atom *argv) - { -+ int bufsize; -+ char *buf; - t_print *x = (t_print *)pd_new(print_class); -- x->x_sym = atom_getsymbolarg(0,argc,argv); -- if (x->x_sym == &s_) -- x->x_sym = atom_getfloatarg(0,argc,argv); -- if (*s->s_name) x->x_sym = s; -- else x->x_sym = gensym("print"); -+ if (argc) -+ { -+ t_binbuf *bb = binbuf_new(); -+ binbuf_add(bb, argc, argv); -+ binbuf_gettext(bb, &buf, &bufsize); -+ buf[bufsize] = 0; -+ x->x_sym = gensym(buf); -+ binbuf_free(bb); -+ } -+ else -+ { -+ x->x_sym = gensym("print"); -+ } - return (x); - } - diff --git a/packages/patches/makeversion_tweak-0.41.0-test10.patch b/packages/patches/makeversion_tweak-0.41.0-test10.patch deleted file mode 100644 index 7868269b..00000000 --- a/packages/patches/makeversion_tweak-0.41.0-test10.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: s_main.c -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/s_main.c,v -retrieving revision 1.28.6.6 -diff -u -r1.28.6.6 s_main.c ---- s_main.c 6 Jan 2008 04:19:15 -0000 1.28.6.6 -+++ s_main.c 6 Jan 2008 04:29:01 -0000 -@@ -249,10 +249,11 @@ - static void pd_makeversion(void) - { - char foo[100]; -- sprintf(foo, "Pd version %d.%d-%d%s\n",PD_MAJOR_VERSION, -- PD_MINOR_VERSION,PD_BUGFIX_VERSION,PD_TEST_VERSION); -- pd_version = malloc(strlen(foo)+1); -- strcpy(pd_version, foo); -+ -+ snprintf(foo, sizeof(foo), "Pd version %d.%d-%d%s\n", PD_MAJOR_VERSION, -+ PD_MINOR_VERSION, PD_BUGFIX_VERSION, PD_TEST_VERSION); -+ -+ pd_version = strdup(foo); - } - - /* this is called from main() in s_entry.c */ diff --git a/packages/patches/normalize_pd_guidir-0.40.3.patch b/packages/patches/normalize_pd_guidir-0.40.3.patch deleted file mode 100644 index e098b4a3..00000000 --- a/packages/patches/normalize_pd_guidir-0.40.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.25 -diff -u -w -r1.25 u_main.tk ---- u_main.tk 9 Oct 2006 04:36:12 -0000 1.25 -+++ u_main.tk 15 Aug 2007 18:57:49 -0000 -@@ -36,7 +36,7 @@ - global pd_tearoff - set pd_gui2 [string range $argv0 0 [expr [string last \\ $argv0 ] - 1]] - regsub -all \\\\ $pd_gui2 / pd_gui3 -- set pd_guidir $pd_gui3/.. -+ set pd_guidir [file normalize $pd_gui3/..] - load $pd_guidir/bin/pdtcl.dll - set pd_tearoff 1 - } -@@ -53,7 +53,7 @@ - global pd_guidir - global pd_tearoff - set pd_gui2 [string range $argv0 0 [expr [string last / $argv0 ] - 1]] -- set pd_guidir $pd_gui2/.. -+ set pd_guidir [file normalize $pd_gui2/..] - load $pd_guidir/bin/libPdTcl.dylib - set pd_tearoff 0 - global pd_macready diff --git a/packages/patches/set_pd_window_location-0.41.0-test03.patch b/packages/patches/set_pd_window_location-0.41.0-test03.patch deleted file mode 100644 index 0d8d6c2d..00000000 --- a/packages/patches/set_pd_window_location-0.41.0-test03.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: u_main.tk -=================================================================== -RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v -retrieving revision 1.17.2.20 -diff -u -w -r1.17.2.20 u_main.tk ---- u_main.tk 11 Jul 2007 21:55:45 -0000 1.17.2.20 -+++ u_main.tk 23 Jul 2007 20:42:21 -0000 -@@ -225,6 +225,8 @@ - pdtk_standardkeybindings . - - wm title . "Pd" -+# initial location of Pd window (+x+y) -+wm geometry . +20+70 - . configure -menu .mbar -width 200 -height 150 - - ############### set up global variables ################################ -- cgit v1.2.1