Pd-cvs July 2007

pd-cvs@lists.iem.at

20 participants
623 discussions

externals/pidip/modules pdp_qtext.c, 1.3, 1.4 pdp_text.c, 1.6, 1.7
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20289 Modified Files: pdp_qtext.c pdp_text.c Log Message: switched default font to Bitstream Vera, since it's free and added more font paths where most fonts live Index: pdp_qtext.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_qtext.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pdp_qtext.c 10 May 2007 23:01:30 -0000 1.3 --- pdp_qtext.c 24 Jul 2007 00:36:04 -0000 1.4 *************** *** 38,42 **** #define DEFAULT_CAPACITY 10 ! #define DEFAULT_FONT "helmetr/16" #define PIDIP_TEXT_MODE_STATIC 0 --- 38,43 ---- #define DEFAULT_CAPACITY 10 ! ! #define DEFAULT_FONT "Vera/16" #define PIDIP_TEXT_MODE_STATIC 0 *************** *** 1072,1081 **** class_addmethod(pdp_qtext_class, (t_method)pdp_qtext_mode, gensym("layermode"), A_SYMBOL, A_NULL); - imlib_add_path_to_font_path("/usr/X11R6/lib/X11/fonts/TTF"); font = imlib_load_font(DEFAULT_FONT); if ( !font ) { post( "pdp_qtext : severe error : could not load default font : no rendering !!!" ); } imlib_context_set_font( font ); --- 1073,1090 ---- class_addmethod(pdp_qtext_class, (t_method)pdp_qtext_mode, gensym("layermode"), A_SYMBOL, A_NULL); imlib_add_path_to_font_path("/usr/X11R6/lib/X11/fonts/TTF"); + #ifdef __APPLE__ + imlib_add_path_to_font_path("/System/Library/Fonts"); + imlib_add_path_to_font_path("/Library/Fonts"); + imlib_add_path_to_font_path("/sw/share/imlib2/data/fonts"); + imlib_add_path_to_font_path("/sw/lib/X11/fonts/msttf"); + #else + imlib_add_path_to_font_path("/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"); + #endif font = imlib_load_font(DEFAULT_FONT); if ( !font ) { post( "pdp_qtext : severe error : could not load default font : no rendering !!!" ); + post( "pdp_text : try installing Bitstream Vera (http://www.gnome.org/fonts/)" ); } imlib_context_set_font( font ); Index: pdp_text.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_text.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pdp_text.c 10 May 2007 23:01:30 -0000 1.6 --- pdp_text.c 24 Jul 2007 00:36:04 -0000 1.7 *************** *** 35,39 **** #define DEFAULT_CAPACITY 10 ! #define DEFAULT_FONT "helmetr/16" static char *pdp_text_version = "pdp_text: version 0.2 : text rendering object written by ydegoyon(a)free.fr"; --- 35,39 ---- #define DEFAULT_CAPACITY 10 ! #define DEFAULT_FONT "Vera/16" static char *pdp_text_version = "pdp_text: version 0.2 : text rendering object written by ydegoyon(a)free.fr"; *************** *** 636,645 **** class_addmethod(pdp_text_class, (t_method)pdp_text_antialias, gensym("antialias"), A_DEFFLOAT, A_NULL); - imlib_add_path_to_font_path("/usr/X11R6/lib/X11/fonts/TTF"); font = imlib_load_font(DEFAULT_FONT); if ( !font ) { post( "pdp_text : severe error : could not load default font : no rendering !!!" ); } imlib_context_set_font( font ); --- 636,653 ---- class_addmethod(pdp_text_class, (t_method)pdp_text_antialias, gensym("antialias"), A_DEFFLOAT, A_NULL); imlib_add_path_to_font_path("/usr/X11R6/lib/X11/fonts/TTF"); + #ifdef __APPLE__ + imlib_add_path_to_font_path("/System/Library/Fonts"); + imlib_add_path_to_font_path("/Library/Fonts"); + imlib_add_path_to_font_path("/sw/share/imlib2/data/fonts"); + imlib_add_path_to_font_path("/sw/lib/X11/fonts/msttf"); + #else + imlib_add_path_to_font_path("/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"); + #endif font = imlib_load_font(DEFAULT_FONT); if ( !font ) { post( "pdp_text : severe error : could not load default font : no rendering !!!" ); + post( "pdp_text : try installing Bitstream Vera (http://www.gnome.org/fonts/)" ); } imlib_context_set_font( font );

1 0

doc/tutorials/cognition durations_affect_recognition.pd, NONE, 1.1.2.1 ear_dominance.pd, NONE, 1.1.2.1 identification_of_order.pd, NONE, 1.1.2.1 change_perception.pd, 1.1.2.1, 1.1.2.2 durations affect recognition.pd, 1.1, NONE ear dominance.pd, 1.2, NONE identification of order.pd, 1.1, NONE
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/doc/tutorials/cognition In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31289 Modified Files: Tag: branch-v0-39-2-extended change_perception.pd Added Files: Tag: branch-v0-39-2-extended durations_affect_recognition.pd ear_dominance.pd identification_of_order.pd Removed Files: Tag: branch-v0-39-2-extended durations affect recognition.pd ear dominance.pd identification of order.pd Log Message: removed spaces from filenames --- NEW FILE: ear_dominance.pd --- #N canvas 336 40 530 602 10; #X obj 0 0 cnv 15 520 40 empty empty ear_dominance 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; #X text 36 166 The original experiment is from:; #X text 46 182 Deutsch \, D. (1975). Musical Illusions. Scientific American \, 233 \, pp92-104.; #X obj 251 550 dac~; #X obj 168 496 *~; #X obj 184 470 tgl 25 1 empty empty left 0 -6 1 10 -212983 -1 -1 1 1; #X obj 168 431 *~; #X obj 168 384 osc~; #X obj 212 282 alternate; #X obj 146 359 t b f b; #X msg 212 391 0 5; #X msg 127 391 1 5; #X obj 184 412 line~; #X msg 16 272 \; pd dsp \$1; #X obj 105 230 tgl 35 0 empty empty start 0 -6 1 12 -4033 -1 -1 0 1 ; #X obj 212 258 metro 500; #X obj 193 256 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 160 322 220; #X msg 189 322 440; #X msg 279 321 440; #X msg 309 321 220; #X obj 342 496 *~; #X obj 358 470 tgl 25 1 empty empty right 0 -6 1 10 -261364 -1 -1 1 1; #X obj 342 431 *~; #X obj 342 384 osc~; #X obj 320 359 t b f b; #X msg 386 391 0 5; #X msg 301 391 1 5; #X obj 358 412 line~; #X text 35 51 Most listeners perceive this stream as a tone alternating back and forth from ear to ear \, while alternating between high and low pitches. What is actually happening is that the high and low tones are alternating in each ear \, but at opposite times.; #X text 35 119 Your dominant ear tells the brain that the pitch of the tone is changing \, while both ears track the position of the high pitched tone.; #X connect 5 0 4 0; #X connect 6 0 5 1; #X connect 7 0 5 0; #X connect 8 0 7 0; #X connect 9 0 19 0; #X connect 9 0 18 0; #X connect 9 1 20 0; #X connect 9 1 21 0; #X connect 10 0 12 0; #X connect 10 1 8 0; #X connect 10 2 11 0; #X connect 11 0 13 0; #X connect 12 0 13 0; #X connect 13 0 7 1; #X connect 15 0 14 0; #X connect 15 0 16 0; #X connect 16 0 9 0; #X connect 16 0 17 0; #X connect 18 0 10 0; #X connect 19 0 26 0; #X connect 20 0 10 0; #X connect 21 0 26 0; #X connect 22 0 4 1; #X connect 23 0 22 1; #X connect 24 0 22 0; #X connect 25 0 24 0; #X connect 26 0 28 0; #X connect 26 1 25 0; #X connect 26 2 27 0; #X connect 27 0 29 0; #X connect 28 0 29 0; #X connect 29 0 24 1; Index: change_perception.pd =================================================================== RCS file: /cvsroot/pure-data/doc/tutorials/cognition/change_perception.pd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** change_perception.pd 18 Dec 2006 02:38:13 -0000 1.1.2.1 --- change_perception.pd 23 Jul 2007 23:38:22 -0000 1.1.2.2 *************** *** 1,3 **** ! #N canvas 81 76 580 594 10; #X obj 6 206 cnv 15 250 40 empty empty empty 20 12 0 14 -261689 -66577 0; --- 1,3 ---- ! #N canvas 81 76 584 598 10; #X obj 6 206 cnv 15 250 40 empty empty empty 20 12 0 14 -261689 -66577 0; --- NEW FILE: identification_of_order.pd --- #N canvas 336 40 530 585 10; #X obj 123 280 osc~ 500; #X obj 275 280 phasor~; #X obj 275 261 sig~; #X msg 275 241 300; #X text 74 63 There are four distinct sounds being played in a sequence. Determine the order of the sequence of the sounds.; #X obj 192 259 noise~; #X text 97 619 (Warren 1968 \; Warren et al. 1969 \; Warren and Obusek 1972); #X obj 192 279 hip~ 3000; #X text 347 280 speech 'ee'; #X text 167 119 (from Thinking in Sound \, p.40); #X obj 0 0 cnv 15 580 40 empty empty Identification_of_order 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; #X connect 2 0 1 0; #X connect 3 0 2 0; #X connect 5 0 7 0; --- durations affect recognition.pd DELETED --- --- ear dominance.pd DELETED --- --- NEW FILE: durations_affect_recognition.pd --- #N canvas 448 122 530 585 10; #X text 91 14 Note durations affect recognition; #X text 117 91 (from Thinking in Sound p.52); #X text 57 122 "Sequences of tones forming melodies are perceived as more than a series of pitches \, and seem to have an emergent property characteristic of the particular pattern- in other words \, they form distinctive auditory gestalten or temporal compounds. If melodies can be considered as temporal compounds \, then we would expect to find a 'temporal template' for melody recognition that has both upper and lower durational limits." [1]; #X text 31 479 [1] "Thinking in sound: the cognitive psychology of human audition" \, ed. S. McAdams and E. Bigand. Oxford University Press \, 1993 \, p52; #X text 81 294 play happy birthday fast/slow; #X text 79 320 play twinkle twinkle little star fast/slow; #X obj 0 0 cnv 15 580 40 empty empty durations_affect_recognition 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; --- identification of order.pd DELETED ---

1 0

doc/tutorials/cognition durations_affect_recognition.pd, NONE, 1.1 ear_dominance.pd, NONE, 1.1 identification_of_order.pd, NONE, 1.1 change_perception.pd, 1.1, 1.2 durations affect recognition.pd, 1.1, NONE ear dominance.pd, 1.2, NONE identification of order.pd, 1.1, NONE
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/doc/tutorials/cognition In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30910 Modified Files: change_perception.pd Added Files: durations_affect_recognition.pd ear_dominance.pd identification_of_order.pd Removed Files: durations affect recognition.pd ear dominance.pd identification of order.pd Log Message: removed spaces from filenames --- NEW FILE: ear_dominance.pd --- #N canvas 336 40 530 602 10; #X obj 0 0 cnv 15 520 40 empty empty ear_dominance 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; #X text 36 166 The original experiment is from:; #X text 46 182 Deutsch \, D. (1975). Musical Illusions. Scientific American \, 233 \, pp92-104.; #X obj 251 550 dac~; #X obj 168 496 *~; #X obj 184 470 tgl 25 1 empty empty left 0 -6 1 10 -212983 -1 -1 1 1; #X obj 168 431 *~; #X obj 168 384 osc~; #X obj 212 282 alternate; #X obj 146 359 t b f b; #X msg 212 391 0 5; #X msg 127 391 1 5; #X obj 184 412 line~; #X msg 16 272 \; pd dsp \$1; #X obj 105 230 tgl 35 0 empty empty start 0 -6 1 12 -4033 -1 -1 0 1 ; #X obj 212 258 metro 500; #X obj 193 256 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 160 322 220; #X msg 189 322 440; #X msg 279 321 440; #X msg 309 321 220; #X obj 342 496 *~; #X obj 358 470 tgl 25 1 empty empty right 0 -6 1 10 -261364 -1 -1 1 1; #X obj 342 431 *~; #X obj 342 384 osc~; #X obj 320 359 t b f b; #X msg 386 391 0 5; #X msg 301 391 1 5; #X obj 358 412 line~; #X text 35 51 Most listeners perceive this stream as a tone alternating back and forth from ear to ear \, while alternating between high and low pitches. What is actually happening is that the high and low tones are alternating in each ear \, but at opposite times.; #X text 35 119 Your dominant ear tells the brain that the pitch of the tone is changing \, while both ears track the position of the high pitched tone.; #X connect 5 0 4 0; #X connect 6 0 5 1; #X connect 7 0 5 0; #X connect 8 0 7 0; #X connect 9 0 19 0; #X connect 9 0 18 0; #X connect 9 1 20 0; #X connect 9 1 21 0; #X connect 10 0 12 0; #X connect 10 1 8 0; #X connect 10 2 11 0; #X connect 11 0 13 0; #X connect 12 0 13 0; #X connect 13 0 7 1; #X connect 15 0 14 0; #X connect 15 0 16 0; #X connect 16 0 9 0; #X connect 16 0 17 0; #X connect 18 0 10 0; #X connect 19 0 26 0; #X connect 20 0 10 0; #X connect 21 0 26 0; #X connect 22 0 4 1; #X connect 23 0 22 1; #X connect 24 0 22 0; #X connect 25 0 24 0; #X connect 26 0 28 0; #X connect 26 1 25 0; #X connect 26 2 27 0; #X connect 27 0 29 0; #X connect 28 0 29 0; #X connect 29 0 24 1; Index: change_perception.pd =================================================================== RCS file: /cvsroot/pure-data/doc/tutorials/cognition/change_perception.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** change_perception.pd 16 Dec 2006 19:52:58 -0000 1.1 --- change_perception.pd 23 Jul 2007 23:37:36 -0000 1.2 *************** *** 1,3 **** ! #N canvas 81 76 580 594 10; #X obj 6 206 cnv 15 250 40 empty empty empty 20 12 0 14 -261689 -66577 0; --- 1,3 ---- ! #N canvas 81 76 584 598 10; #X obj 6 206 cnv 15 250 40 empty empty empty 20 12 0 14 -261689 -66577 0; --- NEW FILE: identification_of_order.pd --- #N canvas 336 40 530 585 10; #X obj 123 280 osc~ 500; #X obj 275 280 phasor~; #X obj 275 261 sig~; #X msg 275 241 300; #X text 74 63 There are four distinct sounds being played in a sequence. Determine the order of the sequence of the sounds.; #X obj 192 259 noise~; #X text 97 619 (Warren 1968 \; Warren et al. 1969 \; Warren and Obusek 1972); #X obj 192 279 hip~ 3000; #X text 347 280 speech 'ee'; #X text 167 119 (from Thinking in Sound \, p.40); #X obj 0 0 cnv 15 580 40 empty empty Identification_of_order 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; #X connect 2 0 1 0; #X connect 3 0 2 0; #X connect 5 0 7 0; --- durations affect recognition.pd DELETED --- --- ear dominance.pd DELETED --- --- NEW FILE: durations_affect_recognition.pd --- #N canvas 448 122 530 585 10; #X text 91 14 Note durations affect recognition; #X text 117 91 (from Thinking in Sound p.52); #X text 57 122 "Sequences of tones forming melodies are perceived as more than a series of pitches \, and seem to have an emergent property characteristic of the particular pattern- in other words \, they form distinctive auditory gestalten or temporal compounds. If melodies can be considered as temporal compounds \, then we would expect to find a 'temporal template' for melody recognition that has both upper and lower durational limits." [1]; #X text 31 479 [1] "Thinking in sound: the cognitive psychology of human audition" \, ed. S. McAdams and E. Bigand. Oxford University Press \, 1993 \, p52; #X text 81 294 play happy birthday fast/slow; #X text 79 320 play twinkle twinkle little star fast/slow; #X obj 0 0 cnv 15 580 40 empty empty durations_affect_recognition 20 12 1 18 -216441 -66577 0; #X text 258 24 'cognition' by Hans-Christoph Steiner; --- identification of order.pd DELETED ---

1 0

externals/zexy/src 0x3c0x7e.c,1.6,1.6.2.1
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17121/src Modified Files: Tag: branch-v0-39-2-extended 0x3c0x7e.c Log Message: Removed extraneous "SIMD" messages following this discussion: http://lists.puredata.info/pipermail/pd-list/2007-07/052048.html Index: 0x3c0x7e.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/0x3c0x7e.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** 0x3c0x7e.c 19 May 2006 14:04:32 -0000 1.6 --- 0x3c0x7e.c 23 Jul 2007 23:01:21 -0000 1.6.2.1 *************** *** 197,201 **** ) { - post("SIMD"); dsp_add(lt_tilde_performSSE, 4, in1, in2, out, n); } else --- 197,200 ---- *************** *** 220,224 **** ) { - post("SIMD"); dsp_add(scalarlt_tilde_performSSE, 4, in, &x->x_g, out, n); } else --- 219,222 ----

1 0

externals Makefile,1.150,1.151
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14416 Modified Files: Makefile Log Message: created objectsdir before installing pidip Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.150 retrieving revision 1.151 diff -C2 -d -r1.150 -r1.151 *** Makefile 9 Jul 2007 21:04:06 -0000 1.150 --- Makefile 23 Jul 2007 22:53:56 -0000 1.151 *************** *** 1915,1918 **** --- 1915,1919 ---- # --description "PiDiP is Definitely in Pieces" \ # --license "GNU GPLv2" + install -d $(objectsdir) install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir) install -d $(helpdir)

1 0

externals Makefile,1.103.2.18,1.103.2.19
by Hans-Christoph Steiner 24 Jul '07

24 Jul '07

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11698 Modified Files: Tag: branch-v0-39-2-extended Makefile Log Message: created objectsdir before installing pidip Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.103.2.18 retrieving revision 1.103.2.19 diff -C2 -d -r1.103.2.18 -r1.103.2.19 *** Makefile 27 Jun 2007 19:22:54 -0000 1.103.2.18 --- Makefile 23 Jul 2007 22:46:32 -0000 1.103.2.19 *************** *** 812,816 **** gem2pdp_install: gem2pdp - install -d $(objectsdir) # install -d $(objectsdir)/$(GEM2PDP_NAME) # $(scripts_src)/generate-libdir-metafile.sh $(objectsdir) $(GEM2PDP_NAME) \ --- 812,815 ---- *************** *** 818,821 **** --- 817,821 ---- # --description "Bridges between Gem and PDP" \ # --version "0.6" + install -d $(objectsdir) install -p $(GEM2PDP_OBJECTS:.cpp=.$(EXTENSION)) $(objectsdir) # install -d $(helpdir)/$(GEM2PDP_NAME) *************** *** 1878,1881 **** --- 1878,1882 ---- # --description "PiDiP is Definitely in Pieces" \ # --license "GNU GPLv2" + install -d $(objectsdir) install -p $(externals_src)/pidip/*.$(EXTENSION) $(objectsdir) install -d $(helpdir)/$(PIDIP_NAME)

1 0

pd/src makefile, 1.22.2.3, NONE makefile.dependencies, 1.10.4.3, NONE
by Hans-Christoph Steiner 23 Jul '07

23 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32006 Removed Files: Tag: branch-v0-39-2-extended makefile makefile.dependencies Log Message: removed makefiles generated by the build system from CVS since they are an annoyance and don't need to be there (plus I mistakenly committed some changes to them :-/) --- makefile DELETED --- --- makefile.dependencies DELETED ---

1 0

pd/src makefile, 1.22.2.2, 1.22.2.3 makefile.dependencies, 1.10.4.2, 1.10.4.3 u_main.tk, 1.17.2.20, 1.17.2.21
by Hans-Christoph Steiner 23 Jul '07

23 Jul '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31171 Modified Files: Tag: branch-v0-39-2-extended makefile makefile.dependencies u_main.tk Log Message: Made the Pd window location setting explicit so that the user can easily modify it on their own install following this suggestion by Bjoern Hartmann: http://lists.puredata.info/pipermail/pd-list/2007-07/052342.html Index: makefile =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -C2 -d -r1.22.2.2 -r1.22.2.3 *** makefile 8 Jan 2007 14:47:16 -0000 1.22.2.2 --- makefile 23 Jul 2007 20:49:13 -0000 1.22.2.3 *************** *** 1,33 **** VPATH = ../obj:./ OBJ_DIR = ../obj BIN_DIR = ../bin PDEXEC = $(BIN_DIR)/pd ! EXT= pd_linux ! GUINAME= pd-gui ! INSTALL_PREFIX = /usr/local ! GFLAGS = -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ! MANDIR = ${prefix}/man ! MORECFLAGS = -DDL_OPEN -DPA_USE_OSS -DPA_LITTLE_ENDIAN -DUNIX -DUNISTD -DUSEAPI_OSS -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_linux -fno-strict-aliasing -DPA_USE_ALSA -DUSEAPI_ALSA INCLUDE = -I. ! GINCLUDE = $(INCLUDE) GLIB = -ltk8.4 -ltcl8.4 ! LDFLAGS = -Wl,-export-dynamic -lasound ! LIB = -ldl -lpthread -lasound ! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD ! CFLAGS = -Werror -Wdeclaration-after-statement $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources ! SYSSRC += s_midi_oss.c s_audio_oss.c s_audio_alsa.c s_audio_alsamm.c s_midi_alsa.c SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ --- 1,52 ---- + # On Mac OS X, this needs to be defined to enable dlopen and weak linking + # support. Its safe on other platforms since gcc only checks this env var on + # Apple's gcc. <hans(a)at.or.at> + export MACOSX_DEPLOYMENT_TARGET = 10.3 + VPATH = ../obj:./ OBJ_DIR = ../obj BIN_DIR = ../bin PDEXEC = $(BIN_DIR)/pd ! EXT= pd_darwin ! GUINAME= libPdTcl.dylib ! prefix = /usr/local ! exec_prefix = ${prefix} ! bindir = ${exec_prefix}/bin ! includedir = ${prefix}/include ! libdir = ${exec_prefix}/lib ! mandir = ${prefix}/share/man ! GFLAGS = -DINSTALL_PREFIX=\"$(prefix)\" ! # 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 = -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -Wno-error -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -DPA_LITTLE_ENDIAN -DUSEAPI_JACK INCLUDE = -I. ! GINCLUDE = $(INCLUDE) -F/Library/Frameworks -framework Tcl -framework Tk -I/Library/Frameworks/Tk.framework/Versions/Current/Headers -I/Library/Frameworks/Tcl.framework/Versions/Current/Headers -I/Library/Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders GLIB = -ltk8.4 -ltcl8.4 ! LDFLAGS = -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -weak_framework Jack ! LIB = -ldl -lm -lpthread ! OPT_CFLAGS = -O2 WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD ! CFLAGS = -g -O2 $(ARCH_CFLAGS) $(WARN_CFLAGS) $(OPT_CFLAGS) $(MORECFLAGS) # the sources ! SYSSRC += s_midi_pm.c s_audio_pa.c s_audio_pablio.c s_audio_paring.c ../portaudio/pa_common/pa_allocation.c ../portaudio/pa_common/pa_converters.c ../portaudio/pa_common/pa_cpuload.c ../portaudio/pa_common/pa_dither.c ../portaudio/pa_common/pa_front.c ../portaudio/pa_common/pa_process.c ../portaudio/pa_common/pa_skeleton.c ../portaudio/pa_common/pa_stream.c ../portaudio/pa_common/pa_trace.c ../portaudio/pa_unix/pa_unix_util.c ../portaudio/pa_mac_core/pa_mac_core.c ../portaudio/pa_mac/pa_mac_hostapis.c ../portmidi/pm_mac/pmmac.c ../portmidi/pm_mac/pmmacosxcm.c ../portmidi/pm_common/pmutil.c ../portmidi/pm_common/portmidi.c ../portmidi/porttime/ptmacosx_cf.c s_audio_jack.c ! ! ASIOSRC = ! ! ASIOOBJ = $(ASIOSRC:.cpp=.o) SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \ *************** *** 53,56 **** --- 72,89 ---- GOBJ = $(GSRC:.c=.o) + # get version from m_pd.h to use in doc/1.manual/1.introduction.txt + PD_MAJOR_VERSION := $(shell grep PD_MAJOR_VERSION m_pd.h | \ + sed 's|^.define *PD_MAJOR_VERSION *$[0-9]*$.*|\1|' ) + PD_MINOR_VERSION := $(shell grep PD_MINOR_VERSION m_pd.h | \ + sed 's|^.define *PD_MINOR_VERSION *$[0-9]*$.*|\1|' ) + PD_BUGFIX_VERSION := $(shell grep PD_BUGFIX_VERSION m_pd.h | \ + sed 's|^.define *PD_BUGFIX_VERSION *$[0-9]*$.*|\1|' ) + PD_TEST_VERSION := $(shell grep PD_TEST_VERSION m_pd.h | \ + sed 's|^.define *PD_TEST_VERSION *"$.*$".*|\1|' ) + PD_VERSION := $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) + ifneq ($(PD_TEST_VERSION),) + PD_VERSION := $(PD_VERSION)-$(PD_TEST_VERSION) + endif + # # ------------------ targets ------------------------------------ *************** *** 71,74 **** --- 104,110 ---- $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c + $(ASIOOBJ): %.o : %.cpp + $(CXX) $(CFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.cpp + pd: $(PDEXEC) *************** *** 78,91 **** $(BIN_DIR)/pd-watchdog: s_watchdog.c ! $(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(BIN_DIR)/pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(BIN_DIR)/pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c ! $(PDEXEC): $(OBJ) ! cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) \ $(LIB) --- 114,127 ---- $(BIN_DIR)/pd-watchdog: s_watchdog.c ! $(CC) -O2 $(STRIPFLAG) -o $(BIN_DIR)/pd-watchdog s_watchdog.c $(LIB) $(BIN_DIR)/pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdsend u_pdsend.c $(LIB) $(BIN_DIR)/pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(BIN_DIR)/pdreceive u_pdreceive.c $(LIB) ! $(PDEXEC): $(OBJ) $(ASIOOBJ) ! cd ../obj; $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(ASIOOBJ) $(OBJ) \ $(LIB) *************** *** 101,150 **** cd ../obj && $(CC) -dynamiclib -read_only_relocs warning \ -o $(BIN_DIR)/libPdTcl.dylib $(GOBJ) \ ! -F \ -framework Tcl -framework Tk -framework System \ -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib ! install_name_tool -change /Tcl.framework/Versions/8.4/Tcl\ @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \ ! -change /Tk.framework/Versions/8.4/Tk \ @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ ../bin/libPdTcl.dylib externs: ! cd ../extra/bonk~;make ! cd ../extra/choice;make ! cd ../extra/expr~;make ! cd ../extra/fiddle~;make ! cd ../extra/loop~;make ! cd ../extra/lrshift~;make ! cd ../extra/pique;make - INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) - MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) BINARYMODE=-m755 install: all ! install -d $(INSTDIR)/lib/pd/bin ! install $(BIN_DIR)/$(GUINAME) $(INSTDIR)/lib/pd/bin/$(GUINAME) ! install $(BIN_DIR)/pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog ! install -m644 $(BIN_DIR)/pd.tk $(INSTDIR)/lib/pd/bin/pd.tk ! install -d $(INSTDIR)/bin ! install $(BINARYMODE) $(PDEXEC) $(INSTDIR)/bin/pd ! install -m755 $(BIN_DIR)/pdsend $(INSTDIR)/bin/pdsend ! install -m755 $(BIN_DIR)/pdreceive $(INSTDIR)/bin/pdreceive ! 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 -d $(MANINSTDIR)/man1 ! gzip < ../man/pd.1 > $(MANINSTDIR)/man1/pd.1.gz ! chmod 644 $(MANINSTDIR)/man1/pd.1.gz ! gzip < ../man/pdsend.1 > $(MANINSTDIR)/man1/pdsend.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz ! gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz local-clean: ! -rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \ ! $(BIN_DIR)/pdreceive $(BIN_DIR)/pd-watchdog m_stamp.c -rm -f `find ../portaudio ../portaudio_v18 -name "*.o"` -rm -f *~ --- 137,207 ---- cd ../obj && $(CC) -dynamiclib -read_only_relocs warning \ -o $(BIN_DIR)/libPdTcl.dylib $(GOBJ) \ ! -F/Library/Frameworks \ -framework Tcl -framework Tk -framework System \ -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib ! install_name_tool -change /Library/Frameworks/Tcl.framework/Versions/8.4/Tcl\ @executable_path/../Frameworks/Tcl.framework/Versions/8.4/Tcl \ ! -change /Library/Frameworks/Tk.framework/Versions/8.4/Tk \ @executable_path/../Frameworks/Tk.framework/Versions/8.4/Tk \ ../bin/libPdTcl.dylib + # this is for Windows/MinGW (only?) + $(BIN_DIR)/pdtcl.dll: $(GOBJ) + cd $(BIN_DIR); dllwrap --export-all-symbols --output-def pdtcl.def \ + --output-lib=pdtcl.a --dllname=$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LIB) $(GLIB) + strip --strip-unneeded $(BIN_DIR)/pdtcl.dll + externs: ! cd ../extra/bonk~;make pd_darwin ! cd ../extra/choice;make pd_darwin ! cd ../extra/expr~;make pd_darwin ! cd ../extra/fiddle~;make pd_darwin ! cd ../extra/loop~;make pd_darwin ! cd ../extra/lrshift~;make pd_darwin ! cd ../extra/pique;make pd_darwin BINARYMODE=-m755 + ABOUT_FILE=$(pddocdir)/1.manual/1.introduction.txt install: all ! install -d $(libpdbindir) ! install $(BIN_DIR)/$(GUINAME) $(libpdbindir)/$(GUINAME) ! install $(BIN_DIR)/pd-watchdog $(libpdbindir)/pd-watchdog ! install -m644 $(BIN_DIR)/pd.tk $(libpdbindir)/pd.tk ! install -d $(DESTDIR)$(bindir) ! install $(BINARYMODE) $(PDEXEC) $(DESTDIR)$(bindir)/pd ! install -m755 $(BIN_DIR)/pdsend $(DESTDIR)$(bindir)/pdsend ! install -m755 $(BIN_DIR)/pdreceive $(DESTDIR)$(bindir)/pdreceive ! for dir in $(shell ls -1 ../doc | grep -v CVS); do \ ! echo "installing $$dir"; \ ! install -d $(pddocdir)/$$dir ; \ ! install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \ ! done ! for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \ ! echo "installing 7.stuff/$$dir"; \ ! install -d $(pddocdir)/7.stuff/$$dir ; \ ! install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \ ! done ! mv $(ABOUT_FILE) $(ABOUT_FILE).tmp ! cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \ ! > $(ABOUT_FILE) ! rm $(ABOUT_FILE).tmp ! cp -pr ../extra $(libpddir)/ ! rm -f $(libpddir)/extra/*/*.o ! install -d $(DESTDIR)$(includedir) ! install -m644 m_pd.h $(DESTDIR)$(includedir)/m_pd.h ! install -d $(DESTDIR)$(mandir)/man1 ! gzip < ../man/pd.1 > $(DESTDIR)$(mandir)/man1/pd.1.gz ! chmod 644 $(DESTDIR)$(mandir)/man1/pd.1.gz ! gzip < ../man/pdsend.1 > $(DESTDIR)$(mandir)/man1/pdsend.1.gz ! chmod 644 $(DESTDIR)$(mandir)/man1/pdsend.1.gz ! gzip < ../man/pdreceive.1 > $(DESTDIR)$(mandir)/man1/pdreceive.1.gz ! chmod 644 $(DESTDIR)$(mandir)/man1/pdreceive.1.gz ! @echo "Pd install succeeded." local-clean: ! -rm -f ../obj/* $(BIN_DIR)/pd $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend* \ ! $(BIN_DIR)/pdreceive* $(BIN_DIR)/pd-watchdog* m_stamp.c \ ! $(BIN_DIR)/pd.exe $(BIN_DIR)/pdtcl.* $(BIN_DIR)/pd.tk -rm -f `find ../portaudio ../portaudio_v18 -name "*.o"` -rm -f *~ *************** *** 161,169 **** distclean: clean ! rm -rf config.cache config.log config.status makefile tags \ ! autom4te-*.cache ! echo all: > makefile ! echo -e "\t./configure" >> makefile ! echo -e "\tmake" >> makefile tags: $(SRC) $(GSRC); ctags *.[ch] --- 218,225 ---- distclean: clean ! -rm -f config.cache config.log config.status makefile configure tags \ ! autom4te.cache/output.* autom4te.cache/traces.* autom4te.cache/requests ! -rmdir autom4te.cache ! -rm -rf autom4te-*.cache tags: $(SRC) $(GSRC); ctags *.[ch] *************** *** 175,186 **** 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)/include/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.dependencies --- 231,242 ---- uninstall: ! rm -f -r $(libpddir) ! rm -f $(DESTDIR)$(bindir)/pd ! rm -f $(DESTDIR)$(bindir)/pdsend ! rm -f $(DESTDIR)$(bindir)/pdreceive ! rm -f $(DESTDIR)$(includedir)/m_pd.h ! rm -f $(DESTDIR)$(mandir)/man1/pd.1.gz ! rm -f $(DESTDIR)$(mandir)/man1/pdsend.1.gz ! rm -f $(DESTDIR)$(mandir)/man1/pdreceive.1.gz include makefile.dependencies Index: makefile.dependencies =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.dependencies,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -C2 -d -r1.10.4.2 -r1.10.4.3 *** makefile.dependencies 8 Jan 2007 14:47:16 -0000 1.10.4.2 --- makefile.dependencies 23 Jul 2007 20:49:13 -0000 1.10.4.3 *************** *** 0 **** --- 1,1872 ---- + g_canvas.o: g_canvas.c /usr/include/stdlib.h /usr/include/sys/cdefs.h \ + /usr/include/_types.h /usr/include/sys/_types.h \ + /usr/include/machine/_types.h /usr/include/i386/_types.h \ + /usr/include/sys/wait.h /usr/include/sys/signal.h \ + /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \ + /usr/include/i386/signal.h /usr/include/sys/resource.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h \ + /usr/lib/gcc/i686-apple-darwin8/4.0.1/include/stdint.h \ [...1843 lines suppressed...] + /usr/include/mach/mach_time.h /usr/include/mach/clock.h \ + ../portmidi/porttime/porttime.h + s_audio_jack.o: s_audio_jack.c /usr/include/stdio.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/sys/cdefs.h \ + /usr/include/machine/_types.h /usr/include/i386/_types.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h /usr/include/sys/signal.h \ + /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \ + /usr/include/i386/signal.h /usr/include/sys/resource.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h \ + /usr/lib/gcc/i686-apple-darwin8/4.0.1/include/stdint.h \ + /usr/include/libkern/OSByteOrder.h \ + /usr/include/libkern/i386/OSByteOrder.h /usr/include/alloca.h \ + /usr/include/machine/types.h /usr/include/i386/types.h \ + /usr/include/string.h m_pd.h s_stuff.h /usr/local/include/jack/jack.h \ + /usr/include/pthread.h /usr/include/pthread_impl.h /usr/include/sched.h \ + /usr/include/time.h /usr/include/machine/_limits.h \ + /usr/include/i386/_limits.h /usr/local/include/jack/types.h \ + /usr/include/inttypes.h /usr/local/include/jack/transport.h \ + /usr/include/regex.h Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.17.2.20 retrieving revision 1.17.2.21 diff -C2 -d -r1.17.2.20 -r1.17.2.21 *** u_main.tk 11 Jul 2007 21:55:45 -0000 1.17.2.20 --- u_main.tk 23 Jul 2007 20:49:13 -0000 1.17.2.21 *************** *** 226,229 **** --- 226,231 ---- wm title . "Pd" + # initial location of Pd window (+x+y) + wm geometry . +20+70 . configure -menu .mbar -width 200 -height 150

1 0

packages/patches set_pd_window_location-0.41.0-test03.patch, NONE, 1.1
by Hans-Christoph Steiner 23 Jul '07

23 Jul '07

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30760 Added Files: set_pd_window_location-0.41.0-test03.patch Log Message: Made the Pd window location setting explicit so that it can be easily modified by a user in their own install. I got the idea from Bjoern Hartmann from this thread: http://lists.puredata.info/pipermail/pd-list/2007-07/052342.html --- NEW FILE: set_pd_window_location-0.41.0-test03.patch --- 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 ################################

1 0

packages/linux_make pd-48x48.png, 1.1, 1.2 Makefile, 1.34, 1.35
by Hans-Christoph Steiner 23 Jul '07

23 Jul '07

Update of /cvsroot/pure-data/packages/linux_make In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9654 Modified Files: Makefile Added Files: pd-48x48.png Log Message: added 48x48 png for the Applications menu --- NEW FILE: pd-48x48.png --- (This appears to be a binary file; contents omitted.) Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/linux_make/Makefile,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile 12 Jul 2007 14:27:37 -0000 1.34 --- Makefile 23 Jul 2007 17:04:20 -0000 1.35 *************** *** 75,80 **** # GNOME menu support install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/apps ! install -p $(packages_src)/linux_make/pd.png \ $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/ install -d $(DESTDIR)/usr/share/applications/ install -p $(packages_src)/linux_make/pd-extended.desktop \ --- 75,83 ---- # GNOME menu support install -d $(DESTDIR)/usr/share/icons/hicolor/128x128/apps ! install -p -m0644 $(packages_src)/linux_make/pd.png \ $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/ + install -d $(DESTDIR)/usr/share/pixmaps + install -p -m0644 $(packages_src)/linux_make/pd-48x48.png \ + $(DESTDIR)/usr/share/pixmaps/pd.png install -d $(DESTDIR)/usr/share/applications/ install -p $(packages_src)/linux_make/pd-extended.desktop \

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
63
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 July 2007