Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

pd/src desire.tk,1.1.2.600.2.47,1.1.2.600.2.48
by Mathieu Bouchard 09 Dec '06

09 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32450 Modified Files: Tag: desiredata desire.tk Log Message: fix server prefs when there are no audio devices Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.47 retrieving revision 1.1.2.600.2.48 diff -C2 -d -r1.1.2.600.2.47 -r1.1.2.600.2.48 *** desire.tk 8 Dec 2006 19:04:20 -0000 1.1.2.600.2.47 --- desire.tk 8 Dec 2006 23:41:32 -0000 1.1.2.600.2.48 *************** *** 2964,2968 **** } ! def Canvas popup_help {} {global main; $main class_browser} def Canvas popup_open {} { --- 2964,2968 ---- } ! def Canvas popup_help {} {$::main class_browser} def Canvas popup_open {} { *************** *** 4099,4103 **** } ! def Box popup_help {} {pd pd help $@pdclass} #-----------------------------------------------------------------------------------# --- 4099,4103 ---- } ! def Box popup_help {} {netsend [list pd help $@pdclass]} #-----------------------------------------------------------------------------------# *************** *** 6272,6280 **** def Dialog add_devlist {f name label} { - global _ $self add_stuff $f $name $label menu $f.menu -tearoff 0 set i 0 set trim_name [string trimleft $name "-"] foreach part $@$trim_name { $f.menu add command -label $part \ --- 6272,6280 ---- def Dialog add_devlist {f name label} { $self add_stuff $f $name $label menu $f.menu -tearoff 0 set i 0 set trim_name [string trimleft $name "-"] + set part none ;# in case there are none foreach part $@$trim_name { $f.menu add command -label $part \ *************** *** 7271,7276 **** super close wm title .$self "About DesireData" ! pack [label .$self.title -text "DesireData 0.39.A.pre3" -font {helvetica 24}] -side top ! pack [label .$self.date -text "released on 2006.11.27"] -side top pack [text .$self.text -yscrollcommand ".$self.scroll set" -width 72 ] -side left -fill both -expand yes --- 7271,7276 ---- super close wm title .$self "About DesireData" ! pack [label .$self.title -text "DesireData 0.39.A.pre5" -font {helvetica 24}] -side top ! pack [label .$self.date -text "released on 2006.12.??"] -side top pack [text .$self.text -yscrollcommand ".$self.scroll set" -width 72 ] -side left -fill both -expand yes

1 0

[PD-cvs] pd/extra/sigmund~ makefile, NONE, 1.1.4.1 sigmund~-help.pd, NONE, 1.1.4.1 sigmund~.c, NONE, 1.2.2.1
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/extra/sigmund~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3820 Added Files: Tag: desiredata makefile sigmund~-help.pd sigmund~.c Log Message: from 0.40 --- NEW FILE: makefile --- NAME=sigmund~ CSYM=sigmund_tilde include ../makefile --- NEW FILE: sigmund~.c --- /* Copyright (c) 2005 Miller Puckette. BSD licensed. No warranties. */ /* fix parameter settings not to report pitch if evidence too scanty? note-on detection triggered by falling envelope (a posteriori) reentrancy bug setting loud flag (other parameters too?) tweaked freqs still not stable enough implement block ("-b") mode */ #include "m_pd.h" #include <math.h> #include <stdio.h> #include <string.h> #ifdef MSW #include <malloc.h> #else #include <alloca.h> [...1294 lines suppressed...] gensym("hop"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_maxfreq, gensym("maxfreq"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_npeak, gensym("npeak"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_vibrato, gensym("vibrato"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_stabletime, gensym("stabletime"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_growth, gensym("growth"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_minpower, gensym("minpower"), A_FLOAT, 0); class_addmethod(sigmund_class, (t_method)sigmund_print, gensym("print"), 0); class_addmethod(sigmund_class, (t_method)sigmund_printnext, gensym("printnext"), A_FLOAT, 0); post("sigmund version 0.02"); } --- NEW FILE: sigmund~-help.pd --- #N canvas 209 199 580 617 12; #X text 42 4 sigmund~ - sinusoidal analysis and pitch tracking; #N canvas 432 117 573 597 using-with-tables 0; #X obj 29 368 print peak; #N canvas 0 0 450 300 (subpatch) 0; #X array insignal 1024 float 2; #X coords 0 1 1023 -1 200 140 1; #X restore 83 426 graph; #X obj 314 513 phasor~; #X obj 294 429 loadbang; #X obj 314 461 440; #X floatatom 313 488 5 0 0 0 - - -; #X obj 305 544 tabwrite~ insignal; #X obj 290 516 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 -1; #X text 114 11 Using sigmund~ on arrays; #X text 42 33 If invoked with the "-t" flag (as a creation argument) \, sigmund~ analyzes waveforms stored in arrays. Instead of an incoming signal \, feed it "list" messages with the following arguments:; #X text 37 118 table name (a symbol); #X text 38 137 number of points; #X obj 29 342 sigmund~ -t -npeak 10 -maxfreq 5000 peaks; #X msg 29 316 list insignal 1024 0 44100 0; #X text 37 158 index of first point; #X text 39 179 sample rate; #X text 38 200 debug flag (print debugging info if nonzero); #X text 23 232 In this mode \, only the "env" \, "pitch" \, and "peaks" outputs are meaningful.; #X text 31 294 click here to test:; #X connect 2 0 6 0; #X connect 3 0 4 0; #X connect 4 0 5 0; #X connect 5 0 2 0; #X connect 5 0 7 0; #X connect 7 0 6 0; #X connect 12 0 0 0; #X connect 13 0 12 0; #X restore 330 553 pd using-with-tables; #X obj 40 512 phasor~; #X obj 40 425 loadbang; #X floatatom 40 471 5 0 120 0 - - -; #X floatatom 39 561 5 0 0 0 - - -; #X floatatom 245 563 5 0 0 0 - - -; #X obj 40 490 mtof; #X obj 40 448 69; #X text 38 579 pitch; #X text 222 582 envelope; #X text 13 28 Sigmund~ analyzes an incoming sound into sinusoidal components \, which may be reported individually or combined to form a pitch estimate. Possible outputs are specified as creation arguments:; #X text 55 129 env - output pitches at the beginning of notes; #X text 56 95 pitch - output pitch continuously; #N canvas 518 74 588 728 setting-parameters 0; #X msg 182 66 print; #X floatatom 192 92 5 0 0 0 - - -; #X msg 192 113 minpower \$1; #X obj 182 139 sigmund~ -minpower 40; #X text 39 14 You can set parameters either by creation arguments \, or else using messages. The "print" message gives you the current values of all the parameters:; #X text 28 169 npts: number of points used in an analysis. Must be a power of two \, at least 128 The minimum frequency that can be tracked is about 2(sample_rate)/npts.; #X text 26 219 hop: number of points between analyses. Must be a power of two \, at least the DSP vector size (usually 64). This regulates the number of analyses done per unit of time.; #X text 28 271 npeak: maximum number of sinusoidal peaks to look for. The computation time is quadratic in the number of peaks actually found (this number only sets an upper limit). Use it to balance CPU time with quality of results.; #X text 30 336 maxfreq: maximum frequency of sinusoidal peaks to look for. This can be useful in situations where background noise creates high-frequency \, spurious peaks..; #X text 37 388 vibrato: maximum deviation from "pitch" to accept as normal vibrato (affects "notes" output only). If the value is too small. vibratos will appear as trills. If too large \, very small melodic intervals may not be reported as new notes.; #X text 33 457 stabletime: time period to wait before reporting a note (affects "notes" output only). The "pitch" must be present and must not vary more than "vibrato" for this entire period to report a note. If too large \, the "notes" will be unnecessarily delayed. If too small \, spurious notes get output.; #X text 31 551 minpower: minimum measured RMS level to report a pitch (affects "pitch" and "notes" output only). Signals quieter than this will be assumed to be crosstalk and ignored.; #X text 32 602 growth: minimum measured RMS growth to report a new note (affects "notes" output only). The RMS level must rise by this many dB (within a time period given by "stabletime") to report a repetition of a note at or near the previously output pitch.; #X connect 0 0 3 0; #X connect 1 0 2 0; #X connect 2 0 3 0; #X restore 330 531 pd setting-parameters; #N canvas 190 230 640 535 sinusoid-tracking 0; #X obj 124 267 sigmund~ -npeak 10 peaks; #X obj 124 214 phasor~; #X obj 124 144 loadbang; #X floatatom 124 190 5 0 120 0 - - -; #X obj 124 295 route 0 1 2 3 4 5 6 7 8 9; #X obj 82 339 unpack 0 0 0 0; #X floatatom 82 461 5 0 0 0 - - -; #X floatatom 122 431 5 0 0 0 - - -; #X floatatom 162 406 5 0 0 0 - - -; #X obj 124 167 440; #X floatatom 203 380 5 0 0 0 - - -; #X obj 322 349 unpack 0 0 0 0; #X floatatom 322 471 5 0 0 0 - - -; #X floatatom 362 441 5 0 0 0 - - -; #X floatatom 402 416 5 0 0 0 - - -; #X floatatom 443 390 5 0 0 0 - - -; #X text 385 475 frequency (Hz.); #X text 419 442 peak amplitude (linear); #X text 464 416 cosine component; #X text 499 390 sine component; #X text 42 26 You can ask for sinusoidal peaks in decreasing order of amplitude or arranged into maximally continuous tracks for resynthesis. (Or you can ask for both.) In any case \, out come lists of five numbers \, one for each sinusoid at each analysis period. The first is the number of the sinusoid (so you can use "route" to claw them apart). The other four are as shown:; #X text 79 505 loudest partial; #X text 332 508 quietest partial; #X connect 0 0 4 0; #X connect 1 0 0 0; #X connect 2 0 9 0; #X connect 3 0 1 0; #X connect 4 0 5 0; #X connect 4 9 11 0; #X connect 5 0 6 0; #X connect 5 1 7 0; #X connect 5 2 8 0; #X connect 5 3 10 0; #X connect 9 0 3 0; #X connect 11 0 12 0; #X connect 11 1 13 0; #X connect 11 2 14 0; #X connect 11 3 15 0; #X restore 330 508 pd sinusoid-tracking; #X text 52 165 tracks - output sinusoidal peaks organized into tracks ; #X text 56 111 notes - output pitch at the beginning of notes; #X text 339 485 more details:; #X text 10 184 Parameters you may set (in creation arguments or messages): ; #X text 60 207 npts - number of points in each analysis window (1024) ; #X text 60 225 hop - number of points between each analysis (512); #X text 60 242 npeak - number of sinusoidal peaks (20); #X text 61 279 vibrato - depth of vibrato to expect in 1/2-tones (1) ; #X text 60 298 stabletime - time (msec) to wait to report notes (50) ; #X obj 39 535 sigmund~ -hop 4096 pitch env; #X text 62 316 minpower - minimum power (dB) to report a pitch (50) ; #X text 62 335 growth - growth (dB) to report a new note (7); #X text 54 147 peaks - output all sinusoidal peaks in order of amplitude ; #X text 380 596 updated for Pd v0.40; #X text 11 356 The npts and hop parameters are in samples \, and are powers of two. The example below specifies a huge hop of 4096 (to slow the output down) and to output "pitch" and "env". (Those are the default outputs.); #X text 61 260 maxfreq - maximum sinusoid frequency in Hz. (1000000) ; #X connect 2 0 25 0; #X connect 3 0 8 0; #X connect 4 0 7 0; #X connect 7 0 2 0; #X connect 8 0 4 0; #X connect 25 0 5 0; #X connect 25 1 6 0;

1 0

pd/extra makefile,NONE,1.5.2.1
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3447 Added Files: Tag: desiredata makefile Log Message: from 0.40 --- NEW FILE: makefile --- current: pd_linux # ----------------------- NT ----------------------- pd_nt: $(NAME).dll .SUFFIXES: .dll PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo VC="C:\Program Files\Microsoft Visual Studio\Vc98" PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include PDNTLDIR = $(VC)\lib PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\kernel32.lib \ ..\..\bin\pd.lib .c.dll: cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB) # ----------------------- IRIX 5.x ----------------------- pd_irix5: $(NAME).pd_irix5 .SUFFIXES: .pd_irix5 SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 SGIINCLUDE = -I../../src .c.pd_irix5: $(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o rm $*.o # ----------------------- IRIX 6.x ----------------------- pd_irix6: $(NAME).pd_irix6 .SUFFIXES: .pd_irix6 SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ -Ofast=ip32 .c.pd_irix6: $(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o rm $*.o # ----------------------- LINUX i386 ----------------------- pd_linux: $(NAME).pd_linux .SUFFIXES: .pd_linux LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \ -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS) LINUXINCLUDE = -I../../src .c.pd_linux: $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -m32 -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm strip --strip-unneeded $*.pd_linux rm -f $*.o # ----------------------- Mac OSX ----------------------- d_ppc: $(NAME).d_ppc d_fat: $(NAME).d_fat .SUFFIXES: .d_ppc .d_fat DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch .c.d_ppc: $(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o rm -f $*.o .c.d_fat: $(CC) -arch i386 -arch ppc $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c $(CC) -arch i386 -arch ppc -bundle -undefined suppress -flat_namespace \ -o $*.d_fat $*.o rm -f $*.o # ---------------------------------------------------------- clean: rm -f *.o *.pd_* so_locations

1 0

pd/src TODO, 1.1.2.28.2.2, 1.1.2.28.2.3 ChangeLog, 1.1.4.11.2.4, 1.1.4.11.2.5
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20351 Modified Files: Tag: desiredata TODO ChangeLog Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.28.2.2 retrieving revision 1.1.2.28.2.3 diff -C2 -d -r1.1.2.28.2.2 -r1.1.2.28.2.3 *** TODO 7 Dec 2006 22:43:14 -0000 1.1.2.28.2.2 --- TODO 8 Dec 2006 21:39:47 -0000 1.1.2.28.2.3 *************** *** 1,8 **** DesireData's TODO list, $Id$ ! ---------------------------------------------------------------- 0.39.A.pre4 ! ! ---------------------------------------------------------------- 0.39.A.pre5 [ ] implement timeout in def Manager call [ ] <matju> chun: this is a feature called "loading", which is in pd but not in dd. --- 1,8 ---- DesireData's TODO list, $Id$ ! ---------------------------------------------------------------- 0.40.pre5 + [ ] merge 0.40 + [ ] paths stopped working [ ] implement timeout in def Manager call [ ] <matju> chun: this is a feature called "loading", which is in pd but not in dd. *************** *** 12,16 **** [ ] Implement (or fix) Find, Find Again [ ] implement "Find Last Error" ! [ ] table of all objects (for use by clients) [ ] expr {} [ ] def def --- 12,16 ---- [ ] Implement (or fix) Find, Find Again [ ] implement "Find Last Error" ! [ ] table of all objects (as crash protection) [ ] expr {} [ ] def def *************** *** 18,24 **** [ ] rightclick help doesn't work with msgboxes, floatatoms, symbolatoms [ ] new objectbox doesn't focus if mouse hasn't been in window ! ---------------------------------------------------------------- 0.39.A [ ] skip unneeded motion events inside client (do we need this?) [ ] rename pd to pd-server, desire.tk to pd-client, add new program "pd" which would launch both (will we really do this?) --- 18,27 ---- [ ] rightclick help doesn't work with msgboxes, floatatoms, symbolatoms [ ] new objectbox doesn't focus if mouse hasn't been in window + [ ] [hsl]/[vsl]: add switch between horiz and vert. + [ ] [hradio]/[vradio]: add switch between horiz and vert. ! ---------------------------------------------------------------- 0.40.pre6-... + [ ] merge 0.41 [ ] skip unneeded motion events inside client (do we need this?) [ ] rename pd to pd-server, desire.tk to pd-client, add new program "pd" which would launch both (will we really do this?) *************** *** 90,96 **** [ ] multilingual labels in objects [ ] multilingual comments - [ ] fix look of selection - [ ] fork from devel_0_39 - [ ] merge 0.40 [ ] what would be needed to be able to use gdb --pid=... ? --- 93,96 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.4.11.2.4 retrieving revision 1.1.4.11.2.5 diff -C2 -d -r1.1.4.11.2.4 -r1.1.4.11.2.5 *** ChangeLog 7 Dec 2006 22:43:14 -0000 1.1.4.11.2.4 --- ChangeLog 8 Dec 2006 21:39:47 -0000 1.1.4.11.2.5 *************** *** 1,4 **** --- 1,9 ---- $Id$ + Desire 0.40.pre5 (2006.12.??) (-r desiredata; ./configure && make) : + + * merged in Miller's 0.40 (80% of it) + * + Desire 0.39.A.pre4 (2006.12.07) (-r desiredata; ./configure && make) :

1 0

pd/src desire.c, 1.1.2.217.2.50, 1.1.2.217.2.51 desire.h, 1.1.2.49.2.6, 1.1.2.49.2.7
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16435 Modified Files: Tag: desiredata desire.c desire.h Log Message: finished 0.40 changes for desire.[ch] Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.6 retrieving revision 1.1.2.49.2.7 diff -C2 -d -r1.1.2.49.2.6 -r1.1.2.49.2.7 *** desire.h 8 Dec 2006 09:17:55 -0000 1.1.2.49.2.6 --- desire.h 8 Dec 2006 21:28:37 -0000 1.1.2.49.2.7 *************** *** 170,173 **** --- 170,175 ---- unsigned int goprect:1; /* draw rectangle for graph-on-parent */ unsigned int isgraph:1; /* show as graph on parent */ + unsigned int hidetext:1; /* hide object-name + args when doing graph on parent */ + long next_add; /* insertion point for next call to canvas_add (for future use!?) */ }; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.50 retrieving revision 1.1.2.217.2.51 diff -C2 -d -r1.1.2.217.2.50 -r1.1.2.217.2.51 *** desire.c 8 Dec 2006 20:41:29 -0000 1.1.2.217.2.50 --- desire.c 8 Dec 2006 21:28:35 -0000 1.1.2.217.2.51 *************** *** 527,532 **** } ! /* make a new canvas. It will either be a "root" canvas or else its parent will be ! a "text" object in another window... we don't know which yet. */ static t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) { t_canvas *x = (t_canvas *)pd_new(canvas_class); --- 527,532 ---- } ! /* make a new canvas. It will either be a "root" canvas or else it appears as ! a "text" object in another window (canvas_getcurrent() tells us which.) */ static t_canvas *canvas_new(void *dummy, t_symbol *sel, int argc, t_atom *argv) { t_canvas *x = (t_canvas *)pd_new(canvas_class); *************** *** 3299,3309 **** if (x->directsignal) signal_setborrowed(sp[0], x->directsignal); else { ! const int n = outsig->s_n; ! if(n&7) dsp_add(vinlet_perform, 3, x, outsig->s_vec,n); ! else if(SIMD_CHECK1(n,outsig->s_vec)) /* if the outsig->s_vec is aligned the x->read will also be... */ ! dsp_add(vinlet_perfsimd, 3, x, outsig->s_vec,n); ! else ! dsp_add(vinlet_perf8, 3, x, outsig->s_vec,n); x->read = x->buf; } --- 3299,3308 ---- if (x->directsignal) signal_setborrowed(sp[0], x->directsignal); else { ! const int vecsize = outsig->s_vecsize; /* if the outsig->s_vec is aligned the x->read will also be... */ ! if(vecsize&7) dsp_add(vinlet_perform, 3, x, outsig->s_vec,vecsize); ! else if(SIMD_CHECK1(n,outsig->s_vec)) ! dsp_add(vinlet_perfsimd, 3, x, outsig->s_vec,vecsize); ! else dsp_add(vinlet_perf8, 3, x, outsig->s_vec,vecsize); x->read = x->buf; } *************** *** 3348,3352 **** if (parentsigs) { insig = parentsigs[inlet_getsignalindex(x->inlet)]; ! parentvecsize = insig->s_n; re_parentvecsize = parentvecsize * upsample / downsample; } else { --- 3347,3351 ---- if (parentsigs) { insig = parentsigs[inlet_getsignalindex(x->inlet)]; ! parentvecsize = insig->s_vecsize; re_parentvecsize = parentvecsize * upsample / downsample; } else { *************** *** 3576,3580 **** if (parentsigs) { outsig = parentsigs[outlet_getsignalindex(x->parentoutlet)]; ! parentvecsize = outsig->s_n; re_parentvecsize = parentvecsize * upsample / downsample; } else { --- 3575,3579 ---- if (parentsigs) { outsig = parentsigs[outlet_getsignalindex(x->parentoutlet)]; ! parentvecsize = outsig->s_vecsize; re_parentvecsize = parentvecsize * upsample / downsample; } else {

1 0

externals/iem/iemmatrix/tests Makefile, NONE, 1.1 runtests.sh, 1.2, 1.3
by IOhannes m zmölnig 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/externals/iem/iemmatrix/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14569 Modified Files: runtests.sh Added Files: Makefile Log Message: added makefile which calls runtests.sh (with a settable PD) --- NEW FILE: Makefile --- default: nogui nogui: sh runtests.sh gui: sh runtests.sh -gui Index: runtests.sh =================================================================== RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/tests/runtests.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** runtests.sh 14 Oct 2005 10:21:44 -0000 1.2 --- runtests.sh 8 Dec 2006 21:23:45 -0000 1.3 *************** *** 1,4 **** --- 1,9 ---- #!/bin/sh + if [ "x${PD}" = "x" ] + then + PD=pd + fi + RUNTESTS_TXT=runtests.txt RUNTESTS_LOG=runtests.log

1 0

pd/src desire.c,1.1.2.217.2.49,1.1.2.217.2.50
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31410 Modified Files: Tag: desiredata desire.c Log Message: 0.40: rest of the "data structures" stuff ([struct]) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.49 retrieving revision 1.1.2.217.2.50 diff -C2 -d -r1.1.2.217.2.49 -r1.1.2.217.2.50 *** desire.c 8 Dec 2006 17:03:18 -0000 1.1.2.217.2.49 --- desire.c 8 Dec 2006 20:41:29 -0000 1.1.2.217.2.50 *************** *** 1226,1233 **** if (!flag && x->isgraph) { x->isgraph = 0; ! } else if (flag && !x->isgraph) { if (x->pixwidth <= 0) x->pixwidth = CANVAS_DEFGRAPHWIDTH; if (x->pixheight <= 0) x->pixheight = CANVAS_DEFGRAPHHEIGHT; SET(isgraph,1); if (!nogoprect && !x->goprect) { canvas_each(g,x) if (pd_checkobject(g)) {SET(goprect,1); break;} --- 1226,1234 ---- if (!flag && x->isgraph) { x->isgraph = 0; ! } else if (flag) { if (x->pixwidth <= 0) x->pixwidth = CANVAS_DEFGRAPHWIDTH; if (x->pixheight <= 0) x->pixheight = CANVAS_DEFGRAPHHEIGHT; SET(isgraph,1); + SET(hidetext,!!(flag&2)); if (!nogoprect && !x->goprect) { canvas_each(g,x) if (pd_checkobject(g)) {SET(goprect,1); break;} *************** *** 1242,1246 **** float xperpix, yperpix, x1, y1, x2, y2, xpix, ypix, xmargin, ymargin; int graphme; ! pd_scanargs(argc,argv,"ffbffffffff",&xperpix,&yperpix,&graphme, &x1,&y1,&x2,&y2,&xpix,&ypix,&xmargin,&ymargin); SET(pixwidth,(int)xpix); SET(pixheight,(int)ypix); --- 1243,1247 ---- float xperpix, yperpix, x1, y1, x2, y2, xpix, ypix, xmargin, ymargin; int graphme; ! pd_scanargs(argc,argv,"ffiffffffff",&xperpix,&yperpix,&graphme, &x1,&y1,&x2,&y2,&xpix,&ypix,&xmargin,&ymargin); SET(pixwidth,(int)xpix); SET(pixheight,(int)ypix); *************** *** 3722,3725 **** --- 3723,3727 ---- static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x); + static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w); /* make a new scalar and add to the canvas. We create a "gp" here which *************** *** 3901,3905 **** t_canvas *owner; t_symbol *sym; ! t_gtemplate *x_next; int argc; t_atom *argv; --- 3903,3907 ---- t_canvas *owner; t_symbol *sym; ! t_gtemplate *next; int argc; t_atom *argv; *************** *** 3953,3957 **** } else { pd_error(x, "%s: no such type", newtypesym->s_name); ! return 0; } newn = (oldn = x->n) + 1; --- 3955,3959 ---- } else { pd_error(x, "%s: no such type", newtypesym->s_name); ! goto bad; } newn = (oldn = x->n) + 1; *************** *** 4227,4231 **** template_conform(x, y); pd_free(x); ! template_new(templatesym, argc, argv); } } --- 4229,4234 ---- template_conform(x, y); pd_free(x); ! t_template *y2 = template_new(templatesym, argc, argv); ! y2->t_list = 0; } } *************** *** 4239,4242 **** --- 4242,4246 ---- if (*x->sym->s_name) pd_unbind(x,x->sym); t_freebytes(x->vec, x->n * sizeof(*x->vec)); + } *************** *** 4253,4257 **** t_template *t = template_findbyname(sym); x->owner = canvas_getcurrent(); ! x->x_next = 0; x->sym = sym; x->argc = argc; --- 4257,4261 ---- t_template *t = template_findbyname(sym); x->owner = canvas_getcurrent(); ! x->next = 0; x->sym = sym; x->argc = argc; *************** *** 4266,4271 **** if (t->t_list) { t_gtemplate *x2, *x3; ! for (x2 = x->t->t_list; (x3 = x2->x_next); x2 = x3) {} ! x2->x_next = x; post("template %s: warning: already exists.", sym->s_name); } else { --- 4270,4275 ---- if (t->t_list) { t_gtemplate *x2, *x3; ! for (x2 = x->t->t_list; (x3 = x2->next); x2 = x3) {} ! x2->next = x; post("template %s: warning: already exists.", sym->s_name); } else { *************** *** 4317,4335 **** if (x == t->t_list) { canvas_redrawallfortemplate(t, 2); ! if (x->x_next) { /* if we were first on the list, and there are others on the list, make a new template corresponding to the new ! first-on-list and replace teh existing template with it. */ ! t_template *z = template_new(&s_, x->argc, x->argv); template_conform(t, z); pd_free(t); pd_free(z); ! z = template_new(x->sym, x->argc, x->argv); ! z->t_list = x->x_next; } else t->t_list = 0; canvas_redrawallfortemplate(t, 1); } else { t_gtemplate *x2, *x3; ! for (x2=t->t_list; (x3=x2->x_next); x2=x3) if (x==x3) {x2->x_next=x3->x_next; break;} } freebytes(x->argv, sizeof(t_atom) * x->argc); --- 4321,4340 ---- if (x == t->t_list) { canvas_redrawallfortemplate(t, 2); ! if (x->next) { /* if we were first on the list, and there are others on the list, make a new template corresponding to the new ! first-on-list and replace the existing template with it. */ ! t_template *z = template_new(&s_, x->next->argc, x->next->argv); template_conform(t, z); pd_free(t); pd_free(z); ! z = template_new(x->sym, x->next->argc, x->next->argv); ! z->t_list = x->next; ! for (t_gtemplate *y=z->t_list; y ; y=y->next) y->t=z; } else t->t_list = 0; canvas_redrawallfortemplate(t, 1); } else { t_gtemplate *x2, *x3; ! for (x2=t->t_list; (x3=x2->next); x2=x3) if (x==x3) {x2->next=x3->next; break;} } freebytes(x->argv, sizeof(t_atom) * x->argc); *************** *** 4398,4401 **** --- 4403,4407 ---- #define CLOSED 1 #define BEZ 2 + #define NOMOUSE 4 #define A_ARRAY 55 /* LATER decide whether to enshrine this in m_pd.h */ *************** *** 4486,4490 **** /* includes polygons too */ struct t_curve : t_object { ! int flags; /* CLOSED and/or BEZ */ t_slot fillcolor, outlinecolor, width, vis; int npoints; --- 4492,4496 ---- /* includes polygons too */ struct t_curve : t_object { ! int flags; /* CLOSED and/or BEZ and/or NOMOUSE */ t_slot fillcolor, outlinecolor, width, vis; int npoints; *************** *** 4504,4510 **** flags |= CLOSED; } else classname += 4; - if (classname[0] == 'c') flags |= BEZ; - x->flags = flags; slot_setfloat_const(&x->vis, 1); while (1) { t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); --- 4510,4515 ---- flags |= CLOSED; } else classname += 4; slot_setfloat_const(&x->vis, 1); + if (classname[0] == 'c') flags |= BEZ; while (1) { t_symbol *firstarg = atom_getsymbolarg(0, argc, argv); *************** *** 4512,4517 **** --- 4517,4527 ---- slot_setfloatarg(&x->vis, 1, argv+1); argc -= 2; argv += 2; + } else + if (!strcmp(firstarg->s_name, "-x")) { + flags |= NOMOUSE; + argc -= 1; argv += 1; } else break; } + x->flags = flags; if (flags&CLOSED&&argc) slot_setfloatarg( &x->fillcolor, argc--,argv++); else slot_setfloat_const(&x->fillcolor, 0); *************** *** 4546,4550 **** t_slot *f = x->vec; int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; ! if (!slot_getfloat(&x->vis, t, data, 0)) { *xp1 = *yp1 = 0x7fffffff; *xp2 = *yp2 = -0x7fffffff; --- 4556,4560 ---- t_slot *f = x->vec; int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; ! if (x->flags&NOMOUSE || !slot_getfloat(&x->vis, t, data, 0)) { *xp1 = *yp1 = 0x7fffffff; *xp2 = *yp2 = -0x7fffffff; *************** *** 4613,4616 **** --- 4623,4628 ---- t_word *wp; t_template *t; + t_gpointer gpointer; + } cm; *************** *** 4622,4631 **** t_curve *x = (t_curve *)z; t_slot *f = x->vec + cm.field; cm.xcumulative += dx; cm.ycumulative += dy; if (f[0].var && dx!=0) slot_setcoord(f, cm.t, cm.wp, cm.xbase + cm.xcumulative*cm.xper, 1); if (f[1].var && dy!=0) slot_setcoord(f+1, cm.t, cm.wp, cm.ybase + cm.ycumulative*cm.yper, 1); ! if (cm.scalar) scalar_redraw(cm.scalar, cm.canvas); ! if (cm.array) array_redraw(cm.array, cm.canvas); } #endif --- 4634,4646 ---- t_curve *x = (t_curve *)z; t_slot *f = x->vec + cm.field; + t_atom at; + if (!gpointer_check(&curve_motion_gpointer, 0)) {post("curve_motion: scalar disappeared"); return;} cm.xcumulative += dx; cm.ycumulative += dy; if (f[0].var && dx!=0) slot_setcoord(f, cm.t, cm.wp, cm.xbase + cm.xcumulative*cm.xper, 1); if (f[1].var && dy!=0) slot_setcoord(f+1, cm.t, cm.wp, cm.ybase + cm.ycumulative*cm.yper, 1); ! /* LATER figure out what to do to notify for an array? */ ! if (cm.scalar) template_notifyforscalar(cm.t, cm.canvas, cm.scalar, gensym("change"), 1, &at); ! if (cm.scalar) gobj_changed(cm.scalar,0); else gobj_changed(cm.array,0); } #endif *************** *** 4666,4669 **** --- 4681,4686 ---- cm.field = 2*bestn; cm.t = t; + if (cm.scalar) gpointer_setcanvas(&cm.gpointer, cm.canvas, cm.scalar); + else gpointer_setarray(&cm.gpointer, cm.array, cm.wp); /* canvas_grab(canvas, z, curve_motion, 0, xpix, ypix); */ } *************** *** 5160,5167 **** t_drawnumber *x = (t_drawnumber *)z; t_slot *f = &x->value; dn.ycumulative -= dy; template_setfloat(dn.t, f->u.varsym, dn.wp, dn.ycumulative, 1); ! if (dn.scalar) scalar_redraw(dn.scalar, dn.canvas); ! if (dn.array) array_redraw(dn.array, dn.canvas); } #endif --- 5177,5186 ---- t_drawnumber *x = (t_drawnumber *)z; t_slot *f = &x->value; + t_atom at; + if (!gpointer_check(&dn.gpointer, 0)) {post("drawnumber_motion: scalar disappeared"); return;} + if (dn.symbol) {post("drawnumber_motion: symbol"); return;} dn.ycumulative -= dy; template_setfloat(dn.t, f->u.varsym, dn.wp, dn.ycumulative, 1); ! if (dn.scalar) gobj_changed(dn.scalar); else gobj_changed(dn.array); } #endif *************** *** 5205,5210 **** template_setfloat(dn.t, f->u.varsym, dn.wp, newf, 1); if (dn.scalar) template_notifyforscalar(dn.t, dn.canvas, dn.scalar, gensym("change"), 1, &at); ! if (dn.scalar) scalar_redraw(dn.scalar, dn.canvas); ! if (dn.array) array_redraw(dn.array, dn.canvas); } } --- 5224,5228 ---- template_setfloat(dn.t, f->u.varsym, dn.wp, newf, 1); if (dn.scalar) template_notifyforscalar(dn.t, dn.canvas, dn.scalar, gensym("change"), 1, &at); ! if (dn.scalar) gobj_changed(dn.scalar,0); else gobj_changed(dn.array,0); } } *************** *** 5222,5227 **** dn.scalar = sc; dn.array = ap; dn.ycumulative = slot_getfloat(&x->value, t, data, 0); ! /* canvas_grab(canvas, z, drawnumber_motion, 0, xpix, ypix); */ } return 1; --- 5240,5250 ---- dn.scalar = sc; dn.array = ap; + dn.firstkey = 1; dn.ycumulative = slot_getfloat(&x->value, t, data, 0); ! dn.symbol = (x->flags & DRAW_SYMBOL)!=0; ! if (dn.scalar) ! gpointer_setcanvas(&dn.gpointer, dn.canvas, dn.scalar); ! else gpointer_setarray(&dn.gpointer, dn.array, dn.wp); ! /* canvas_grab(glist, z, drawnumber_motion, drawnumber_key, xpix, ypix); */ } return 1;

1 0

[PD-cvs] pd/src configure, 1.6.2.14.2.9, 1.6.2.14.2.10 configure.in, 1.5.4.5.2.16.2.11, 1.5.4.5.2.16.2.12
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14194 Modified Files: Tag: desiredata configure configure.in Log Message: /bin/sh's syntax is broken by design Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14.2.9 retrieving revision 1.6.2.14.2.10 diff -C2 -d -r1.6.2.14.2.9 -r1.6.2.14.2.10 *** configure 8 Dec 2006 19:38:01 -0000 1.6.2.14.2.9 --- configure 8 Dec 2006 19:54:52 -0000 1.6.2.14.2.10 *************** *** 4333,4345 **** EXTERNTARGET=pd_darwin ### this comes from pd 0.40 ! if test `uname -r` = 7.9.0; then # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc ! else # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" ! fi fi --- 4333,4345 ---- EXTERNTARGET=pd_darwin ### this comes from pd 0.40 ! # if test `uname -r` = 7.9.0; then # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc ! # else # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" ! # fi fi Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.11 retrieving revision 1.5.4.5.2.16.2.12 diff -C2 -d -r1.5.4.5.2.16.2.11 -r1.5.4.5.2.16.2.12 *** configure.in 8 Dec 2006 19:38:01 -0000 1.5.4.5.2.16.2.11 --- configure.in 8 Dec 2006 19:54:53 -0000 1.5.4.5.2.16.2.12 *************** *** 83,95 **** EXTERNTARGET=pd_darwin ### this comes from pd 0.40 ! if test `uname -r` = 7.9.0; then # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc ! else # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" ! fi fi --- 83,95 ---- EXTERNTARGET=pd_darwin ### this comes from pd 0.40 ! # if test `uname -r` = 7.9.0; then # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc ! # else # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" ! # fi fi

1 0

pd/src configure, 1.6.2.14.2.8, 1.6.2.14.2.9 configure.in, 1.5.4.5.2.16.2.10, 1.5.4.5.2.16.2.11
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8171 Modified Files: Tag: desiredata configure configure.in Log Message: disabling -arch for now because it doesn't work on some OSX 10.4 setups (!) Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14.2.8 retrieving revision 1.6.2.14.2.9 diff -C2 -d -r1.6.2.14.2.8 -r1.6.2.14.2.9 *** configure 8 Dec 2006 19:11:25 -0000 1.6.2.14.2.8 --- configure 8 Dec 2006 19:38:01 -0000 1.6.2.14.2.9 *************** *** 4334,4344 **** ### this comes from pd 0.40 if test `uname -r` = 7.9.0; then ! CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat ! LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" fi fi --- 4334,4344 ---- ### this comes from pd 0.40 if test `uname -r` = 7.9.0; then ! # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc else ! # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat ! # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" fi fi Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.10 retrieving revision 1.5.4.5.2.16.2.11 diff -C2 -d -r1.5.4.5.2.16.2.10 -r1.5.4.5.2.16.2.11 *** configure.in 8 Dec 2006 19:11:25 -0000 1.5.4.5.2.16.2.10 --- configure.in 8 Dec 2006 19:38:01 -0000 1.5.4.5.2.16.2.11 *************** *** 84,94 **** ### this comes from pd 0.40 if test `uname -r` = 7.9.0; then ! CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat ! LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" fi fi --- 84,94 ---- ### this comes from pd 0.40 if test `uname -r` = 7.9.0; then ! # CPPFLAGS=$CPPFLAGS" -DMACOSX3" # EXTERNTARGET=d_ppc else ! # CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! # MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat ! # LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" fi fi

1 0

pd/src configure.in, 1.5.4.5.2.16.2.9, 1.5.4.5.2.16.2.10 configure, 1.6.2.14.2.7, 1.6.2.14.2.8 makefile.in, 1.4.4.2.2.21.2.11, 1.4.4.2.2.21.2.12
by Mathieu Bouchard 08 Dec '06

08 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31303 Modified Files: Tag: desiredata configure.in configure makefile.in Log Message: even more like 0.40 Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.11 retrieving revision 1.4.4.2.2.21.2.12 diff -C2 -d -r1.4.4.2.2.21.2.11 -r1.4.4.2.2.21.2.12 *** makefile.in 8 Dec 2006 18:31:31 -0000 1.4.4.2.2.21.2.11 --- makefile.in 8 Dec 2006 19:11:25 -0000 1.4.4.2.2.21.2.12 *************** *** 1,9 **** EXT= @EXT@ LIBSUFFIX = @LIBSUFFIX@ ! INSTALL_PREFIX = @prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@ MORECFLAGS = @MORECFLAGS@ --- 1,15 ---- EXT= @EXT@ LIBSUFFIX = @LIBSUFFIX@ ! prefix = @prefix@ ! exec_prefix = @exec_prefix@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ mandir = @mandir@ + # varibles to match packages/Makefile.buildlayout so that they can be easily + # overridden when building Pd-extended builds. <hans(a)at.or.at> + libpddir = $(libdir)/pd + pddocdir = $(libpddir)/doc + libpdbindir = $(libpddir)/bin MORECFLAGS = @MORECFLAGS@ *************** *** 13,17 **** CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS) CFLAGS += -Wall -Wno-unused-parameter -I. ! CFLAGS += -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" # from DesireData (matju & chun) --- 19,23 ---- CFLAGS = $(CPPFLAGS) @CFLAGS@ $(MORECFLAGS) CFLAGS += -Wall -Wno-unused-parameter -I. ! CFLAGS += -DINSTALL_PREFIX=\"$(prefix)\" # from DesireData (matju & chun) *************** *** 70,98 **** cd $$ext; make @EXTERNTARGET@ || break; cd ..; done - #INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) - INSTDIR = $(INSTALL_PREFIX) - install: all ! install -d $(INSTDIR)/bin ! install -d $(INSTDIR)/lib/pd/bin for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ ! install $$file $(INSTDIR)/lib/pd/bin/$$file; done ! cp -r locale $(INSTDIR)/lib/pd/bin ! cp -r ../icons $(INSTDIR)/lib/pd ! install $(BINARYMODE) $(SO) $(INSTDIR)/lib/$(SO) test -w /etc/ld.so.cache && ldconfig || true ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(INSTDIR)/bin/pd ! install -m755 desire.tk $(INSTDIR)/bin/desire ! install -m755 pdsend $(INSTDIR)/bin/pdsend ! install -m755 pdreceive $(INSTDIR)/bin/pdreceive ! install -m755 pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog ! cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ ! rm -f $(INSTDIR)/extra/*/*.o ! install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h ! install -m644 desire.h $(INSTDIR)/include/desire.h ! install -d $(INSTDIR)$(mandir)/man1 for page in pd.1 pdsend.1 pdreceive.1; do \ ! gzip < ../man/$$page > $(INSTDIR)$(mandir)/man1/$$page.gz; chmod 644 $(INSTDIR)$(mandir)/man1/$$page.gz; done local-clean: --- 76,101 ---- cd $$ext; make @EXTERNTARGET@ || break; cd ..; done install: all ! install -d $(DESTDIR)$(bindir) ! install -d $(DESTDIR)$(libpdbindir) for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ ! install $$file $(DESTDIR)$(libpdbindir)/$$file; done ! cp -r locale $(DESTDIR)$(libpdbindir) ! cp -r ../icons $(DESTDIR)$(libpddir) ! install $(BINARYMODE) $(SO) $(DESTDIR)$(libdir)/$(SO) test -w /etc/ld.so.cache && ldconfig || true ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(DESTDIR)$(bindir)/pd ! install -m755 desire.tk $(DESTDIR)$(bindir)/desire ! install -m755 pdsend $(DESTDIR)$(bindir)/pdsend ! install -m755 pdreceive $(DESTDIR)$(bindir)/pdreceive ! install -m755 pd-watchdog $(DESTDIR)$(libpdbindir)/pd-watchdog ! cp -pr ../doc/* $(DESTDIR)$(pddocdir) ! cp -pr ../extra/* $(DESTDIR)$(libpddir) ! # rm -f $(DESTDIR)$(libpddir)/extra/*/*.o ! install -d $(DESTDIR)$(includedir) ! for file in m_pd.h desire.h; do install -m644 $$file $(DESTDIR)$(includedir)/$$file; done ! install -d $(DESTDIR)$(mandir)/man1 for page in pd.1 pdsend.1 pdreceive.1; do \ ! gzip < ../man/$$page > $(DESTDIR)$(mandir)/man1/$$page.gz; chmod 644 $(DESTDIR)$(mandir)/man1/$$page.gz; done local-clean: *************** *** 124,137 **** uninstall: ! rm -f -r $(INSTDIR)/lib/pd ! rm -f $(INSTDIR)/bin/pd ! rm -f $(INSTDIR)/bin/pdsend ! rm -f $(INSTDIR)/bin/pdreceive ! rm -f $(INSTDIR)/d/m_pd.h ! rm -f $(MANINSTDIR)/man1/pd.1.gz ! rm -f $(MANINSTDIR)/man1/pdsend.1.gz ! rm -f $(MANINSTDIR)/man1/pdreceive.1.gz include makefile.deps ! # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(INSTDIR)$$' --- 127,137 ---- uninstall: ! rm -f -r $(DESTDIR)$(libpddir) ! rm -f $(DESTDIR)$(libdir)/libpd* ! cd $(DESTDIR)$(bindir); rm pd pdsend pdreceive ! cd $(DESTDIR)$(includedir); rm m_pd.h desire.h ! cd $(DESTDIR)$(mandir)/man1; rm pd.1.gz pdsend.1.gz pdreceive.1.gz include makefile.deps ! # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(DESTDIR)$(libdir)$$' Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14.2.7 retrieving revision 1.6.2.14.2.8 diff -C2 -d -r1.6.2.14.2.7 -r1.6.2.14.2.8 *** configure 8 Dec 2006 18:31:31 -0000 1.6.2.14.2.7 --- configure 8 Dec 2006 19:11:25 -0000 1.6.2.14.2.8 *************** *** 4337,4341 **** # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" --- 4337,4342 ---- # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.9 retrieving revision 1.5.4.5.2.16.2.10 diff -C2 -d -r1.5.4.5.2.16.2.9 -r1.5.4.5.2.16.2.10 *** configure.in 8 Dec 2006 18:31:31 -0000 1.5.4.5.2.16.2.9 --- configure.in 8 Dec 2006 19:11:25 -0000 1.5.4.5.2.16.2.10 *************** *** 87,91 **** # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc" --- 87,92 ---- # EXTERNTARGET=d_ppc else ! CPPFLAGS=$CPPFLAGS" -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ! MORECFLAGS=$MORECFLAGS" -arch i386 -arch ppc" # EXTERNTARGET=d_fat LDFLAGS=$LDFLAGS" -arch i386 -arch ppc"

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
83
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2006