Pd-cvs November 2006

pd-cvs@lists.iem.at

16 participants
561 discussions

pd/src s_file.c,1.2.4.8.2.7,1.2.4.8.2.8
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12316 Modified Files: Tag: devel_0_39 s_file.c Log Message: CYGWIN does it like UNIX Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.8.2.7 retrieving revision 1.2.4.8.2.8 diff -C2 -d -r1.2.4.8.2.7 -r1.2.4.8.2.8 *** s_file.c 30 Nov 2005 13:36:58 -0000 1.2.4.8.2.7 --- s_file.c 23 Nov 2006 21:12:30 -0000 1.2.4.8.2.8 *************** *** 34,38 **** void sys_doflags( void); ! #ifdef UNIX static char *sys_prefbuf; --- 34,38 ---- void sys_doflags( void); ! #if defined(UNIX) || defined(__CYGWIN__) static char *sys_prefbuf;

1 0

pd/src s_inter.c,1.5.4.10.2.22,1.5.4.10.2.23
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10729 Modified Files: Tag: devel_0_39 s_inter.c Log Message: if SIGIOT is missing, replace by SIGABRT Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.22 retrieving revision 1.5.4.10.2.23 diff -C2 -d -r1.5.4.10.2.22 -r1.5.4.10.2.23 *** s_inter.c 23 Nov 2006 19:32:05 -0000 1.5.4.10.2.22 --- s_inter.c 23 Nov 2006 21:08:20 -0000 1.5.4.10.2.23 *************** *** 12,16 **** #include "m_imp.h" #include "g_canvas.h" /* for GUI queueing stuff */ ! #ifndef _WIN32 #include <unistd.h> #include <sys/socket.h> --- 12,16 ---- #include "m_imp.h" #include "g_canvas.h" /* for GUI queueing stuff */ ! #ifdef UNISTD #include <unistd.h> #include <sys/socket.h> *************** *** 26,30 **** #include <bstring.h> #endif ! #ifdef _WIN32 #include <io.h> #include <fcntl.h> --- 26,30 ---- #include <bstring.h> #endif ! #if defined(_WIN32) && !defined(__CYGWIN__) #include <io.h> #include <fcntl.h> *************** *** 46,49 **** --- 46,53 ---- #include <stdio.h> + #ifndef SIGIOT + #define SIGIOT SIGABRT + #endif + #ifdef __APPLE__ #include <sys/types.h>

1 0

pd/src m_pd.h,1.4.4.11.2.27,1.4.4.11.2.28
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8519 Modified Files: Tag: devel_0_39 m_pd.h Log Message: __CYGWIN__ causes UNISTD globally Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.27 retrieving revision 1.4.4.11.2.28 diff -C2 -d -r1.4.4.11.2.27 -r1.4.4.11.2.28 *** m_pd.h 2 Sep 2006 09:03:09 -0000 1.4.4.11.2.27 --- m_pd.h 23 Nov 2006 21:02:35 -0000 1.4.4.11.2.28 *************** *** 20,23 **** --- 20,27 ---- #endif + #ifdef __CYGWIN__ + #define UNISTD + #endif + #if defined(MSW) && !defined (__GNUC__) /* #pragma warning( disable : 4091 ) */

1 0

pd/src s_main.c,1.7.4.17.2.21,1.7.4.17.2.22
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23879 Modified Files: Tag: devel_0_39 s_main.c Log Message: fixed mistake i made for when OSS is missing Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.21 retrieving revision 1.7.4.17.2.22 diff -C2 -d -r1.7.4.17.2.21 -r1.7.4.17.2.22 *** s_main.c 23 Nov 2006 19:14:03 -0000 1.7.4.17.2.21 --- s_main.c 23 Nov 2006 20:15:50 -0000 1.7.4.17.2.22 *************** *** 750,757 **** #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); #else NOT_HERE; #endif - oss_set32bit(); argc--; argv++; } --- 750,757 ---- #ifdef USEAPI_OSS sys_set_audio_api(API_OSS); + oss_set32bit(); #else NOT_HERE; #endif argc--; argv++; }

1 0

pd/src s_midi_none.c,1.1.2.1,1.1.2.2
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23112 Modified Files: Tag: devel_0_39 s_midi_none.c Log Message: fix parse error Index: s_midi_none.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_midi_none.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** s_midi_none.c 21 Nov 2006 18:27:47 -0000 1.1.2.1 --- s_midi_none.c 23 Nov 2006 20:13:34 -0000 1.1.2.2 *************** *** 7,11 **** void sys_close_midi(void) {} void sys_putmidimess(int portno, int a, int b, int c) {} - static void writemidi4(PortMidiStream* stream, int a, int b, int c, int d) {} void sys_putmidibyte(int portno, int byte) {} void sys_poll_midi(void) {} --- 7,10 ----

1 0

pd/src desire.c, 1.1.2.199, 1.1.2.200 desire.h, 1.1.2.43, 1.1.2.44
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20588 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: put variable decl in for() Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.43 retrieving revision 1.1.2.44 diff -C2 -d -r1.1.2.43 -r1.1.2.44 *** desire.h 23 Nov 2006 05:52:52 -0000 1.1.2.43 --- desire.h 23 Nov 2006 20:06:52 -0000 1.1.2.44 *************** *** 217,221 **** /* structure for traversing all the connections in a canvas */ ! typedef struct _linetraverser { t_canvas *canvas; t_object *from; int nout; int outlet; t_outlet *outletp; --- 217,221 ---- /* structure for traversing all the connections in a canvas */ ! typedef struct t_linetraverser { t_canvas *canvas; t_object *from; int nout; int outlet; t_outlet *outletp; *************** *** 223,226 **** --- 223,230 ---- t_outconnect *next; int nextoutno; + #ifdef __cplusplus + t_linetraverser() {} + t_linetraverser(t_canvas *canvas); + #endif } t_linetraverser; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.199 retrieving revision 1.1.2.200 diff -C2 -d -r1.1.2.199 -r1.1.2.200 *** desire.c 23 Nov 2006 06:44:54 -0000 1.1.2.199 --- desire.c 23 Nov 2006 20:06:50 -0000 1.1.2.200 *************** *** 68,72 **** #define canvases_each(CANVAS) for(t_canvas *CANVAS=canvas_list; CANVAS; CANVAS=CANVAS->gl_next) #define canvas_wires_each(WIRE,TRAV,CANVAS) \ ! for (linetraverser_start(&TRAV,CANVAS); (WIRE=linetraverser_next(&TRAV)); ) #define CLAMP(_var,_min,_max) do { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } while(0) --- 68,73 ---- #define canvases_each(CANVAS) for(t_canvas *CANVAS=canvas_list; CANVAS; CANVAS=CANVAS->gl_next) #define canvas_wires_each(WIRE,TRAV,CANVAS) \ ! for (t_outconnect *WIRE=(t_outconnect *)666; WIRE==(t_outconnect *)666; ) \ ! for (t_linetraverser TRAV(CANVAS); (WIRE=linetraverser_next(&TRAV)); ) #define CLAMP(_var,_min,_max) do { if (_var<_min) _var=_min; else if (_var>_max) _var=_max; } while(0) *************** *** 435,438 **** --- 436,441 ---- } + t_linetraverser::t_linetraverser(t_canvas *canvas) {linetraverser_start(this,canvas);} + void linetraverser_start(t_linetraverser *t, t_canvas *x) { t->from = 0; *************** *** 735,739 **** static void canvas_drawlines(t_canvas *x) { - t_linetraverser t; t_outconnect *oc; canvas_wires_each(oc,t,x) gobj_changed(oc,0); } --- 738,741 ---- *************** *** 741,745 **** /* kill all lines for one inlet or outlet */ void canvas_deletelinesforio(t_canvas *x, t_text *text, t_inlet *inp, t_outlet *outp) { - t_linetraverser t; t_outconnect *oc; canvas_wires_each(oc,t,x) if ((t.from == text && t.outletp == outp) || --- 743,746 ---- *************** *** 749,753 **** void canvas_deletelinesfor(t_canvas *x, t_text *text) { - t_linetraverser t; t_outconnect *oc; canvas_wires_each(oc,t,x) if (t.from == text || t.to == text) --- 750,753 ---- *************** *** 961,965 **** static void canvas_dodsp(t_canvas *x, int toplevel, t_signal **sp) { - t_linetraverser t; t_outconnect *oc; t_object *ob; t_symbol *dspsym = gensym("dsp"); --- 961,964 ---- *************** *** 1141,1145 **** void canvas_disconnect(t_canvas *x, float from_, float outlet, float to_, float inlet) { - t_linetraverser t; t_outconnect *oc; canvas_wires_each(oc,t,x) { int from = canvas_getindex(x, (t_gobj *)t.from); --- 1140,1143 ---- *************** *** 1246,1250 **** /* keep me */ static int canvas_isconnected (t_canvas *x, t_text *ob1, int n1, t_text *ob2, int n2) { - t_linetraverser t; t_outconnect *oc; canvas_wires_each(oc,t,x) if (t.from == ob1 && t.outlet == n1 && --- 1244,1247 ---- *************** *** 1352,1357 **** static void canvas_stowconnections(t_canvas *x, t_gobj *o) { t_gobj *selhead = 0, *seltail = 0, *nonhead = 0, *nontail = 0; - t_linetraverser t; t_outconnect *oc; - /* split list to "selected" and "unselected" parts */ for (t_gobj *y2,*y = x->list; y; y = y2) { --- 1349,1352 ---- *************** *** 3180,3184 **** static void canvas_saveto(t_canvas *x, t_binbuf *b) { - t_linetraverser t; t_outconnect *oc; canvas_savecontainerto(x,b); canvas_each(y,x) gobj_save(y, b); --- 3175,3178 ---- *************** *** 6746,6750 **** char foo[4096]; t_canvas *can = (t_canvas *)self; - t_linetraverser t; t_outconnect *oc; char *bar=foo; *foo=0; canvas_each(y,can) bar+=sprintf(bar,"x%lx ",(long)y); --- 6740,6743 ----

1 0

pd/src s_midi_pm.c,1.4.4.1.2.7,1.4.4.1.2.8
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12728 Modified Files: Tag: devel_0_39 s_midi_pm.c Log Message: fix for enabling PortMIDI in DesireData. Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.4.4.1.2.7 retrieving revision 1.4.4.1.2.8 diff -C2 -d -r1.4.4.1.2.7 -r1.4.4.1.2.8 *** s_midi_pm.c 30 Aug 2006 08:37:15 -0000 1.4.4.1.2.7 --- s_midi_pm.c 23 Nov 2006 19:44:36 -0000 1.4.4.1.2.8 *************** *** 19,26 **** --- 19,32 ---- #include <string.h> #include <errno.h> + #ifdef DESIRE + #include <portaudio.h> + #include <portmidi.h> + #include <porttime.h> + #else #include "portaudio.h" #include "portmidi.h" #include "porttime.h" #include "pminternal.h" + #endif static PmStream *mac_midiindevlist[MAXMIDIINDEV];

1 0

pd/src s_inter.c,1.5.4.10.2.21,1.5.4.10.2.22
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7983 Modified Files: Tag: devel_0_39 s_inter.c Log Message: security fix for setuid. Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.21 retrieving revision 1.5.4.10.2.22 diff -C2 -d -r1.5.4.10.2.21 -r1.5.4.10.2.22 *** s_inter.c 19 Nov 2006 08:02:55 -0000 1.5.4.10.2.21 --- s_inter.c 23 Nov 2006 19:32:05 -0000 1.5.4.10.2.22 *************** *** 1074,1078 **** else if (!childpid) /* we're the child */ { ! seteuid(getuid()); /* lose setuid priveliges */ #ifndef __APPLE__ /* the wish process in Unix will make a wish shell and --- 1074,1078 ---- else if (!childpid) /* we're the child */ { ! setuid(getuid()); /* lose setuid priveliges */ #ifndef __APPLE__ /* the wish process in Unix will make a wish shell and *************** *** 1250,1254 **** if (pipe(pipe9) < 0) { ! seteuid(getuid()); /* lose setuid priveliges */ sys_sockerror("pipe"); return (1); --- 1250,1254 ---- if (pipe(pipe9) < 0) { ! setuid(getuid()); /* lose setuid priveliges */ sys_sockerror("pipe"); return (1); *************** *** 1257,1261 **** if (watchpid < 0) { ! seteuid(getuid()); /* lose setuid priveliges */ if (errno) perror("sys_startgui"); --- 1257,1261 ---- if (watchpid < 0) { ! setuid(getuid()); /* lose setuid priveliges */ if (errno) perror("sys_startgui"); *************** *** 1266,1270 **** { sys_set_priority(1); ! seteuid(getuid()); /* lose setuid priveliges */ if (pipe9[1] != 0) { --- 1266,1270 ---- { sys_set_priority(1); ! setuid(getuid()); /* lose setuid priveliges */ if (pipe9[1] != 0) { *************** *** 1283,1287 **** { sys_set_priority(0); ! seteuid(getuid()); /* lose setuid priveliges */ close(pipe9[0]); sys_watchfd = pipe9[1]; --- 1283,1287 ---- { sys_set_priority(0); ! setuid(getuid()); /* lose setuid priveliges */ close(pipe9[0]); sys_watchfd = pipe9[1]; *************** *** 1295,1299 **** } ! seteuid(getuid()); /* lose setuid priveliges */ #endif /* __linux__ */ --- 1295,1299 ---- } ! setuid(getuid()); /* lose setuid priveliges */ #endif /* __linux__ */

1 0

pd/src s_main.c,1.7.4.17.2.20,1.7.4.17.2.21
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv968 Modified Files: Tag: devel_0_39 s_main.c Log Message: simplified previous change Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.20 retrieving revision 1.7.4.17.2.21 diff -C2 -d -r1.7.4.17.2.20 -r1.7.4.17.2.21 *** s_main.c 23 Nov 2006 15:03:31 -0000 1.7.4.17.2.20 --- s_main.c 23 Nov 2006 19:14:03 -0000 1.7.4.17.2.21 *************** *** 645,649 **** #undef NOT_HERE ! #define NOT_HERE(x) fprintf(stderr,"option "x" not compiled into this pd\n") int sys_argparse(int argc, char **argv) --- 645,649 ---- #undef NOT_HERE ! #define NOT_HERE fprintf(stderr,"option %s not compiled into this pd\n", *argv) int sys_argparse(int argc, char **argv) *************** *** 742,746 **** sys_set_audio_api(API_OSS); #else ! NOT_HERE("-oss"); #endif argc--; argv++; --- 742,746 ---- sys_set_audio_api(API_OSS); #else ! NOT_HERE; #endif argc--; argv++; *************** *** 751,755 **** sys_set_audio_api(API_OSS); #else ! NOT_HERE("-32bit"); #endif oss_set32bit(); --- 751,755 ---- sys_set_audio_api(API_OSS); #else ! NOT_HERE; #endif oss_set32bit(); *************** *** 761,765 **** sys_set_audio_api(API_ALSA); #else ! NOT_HERE("-alsa"); #endif argc--; argv++; --- 761,765 ---- sys_set_audio_api(API_ALSA); #else ! NOT_HERE; #endif argc--; argv++; *************** *** 772,776 **** else goto usage; #else ! NOT_HERE("-alsaadd"); #endif argc -= 2; argv +=2; --- 772,776 ---- else goto usage; #else ! NOT_HERE; #endif argc -= 2; argv +=2; *************** *** 781,785 **** sys_set_midi_api(API_ALSA); #else ! NOT_HERE("-alsamidi"); #endif argc--; argv++; --- 781,785 ---- sys_set_midi_api(API_ALSA); #else ! NOT_HERE; #endif argc--; argv++; *************** *** 790,794 **** sys_set_audio_api(API_JACK); #else ! NOT_HERE("-jack"); #endif argc--; argv++; --- 790,794 ---- sys_set_audio_api(API_JACK); #else ! NOT_HERE; #endif argc--; argv++; *************** *** 800,804 **** sys_set_audio_api(API_PORTAUDIO); #else ! NOT_HERE("-portaudio"); #endif sys_mmio = 0; --- 800,804 ---- sys_set_audio_api(API_PORTAUDIO); #else ! NOT_HERE; #endif sys_mmio = 0; *************** *** 810,814 **** sys_set_audio_api(API_ASIO); #else ! NOT_HERE("-asio_native"); #endif sys_mmio = 0; --- 810,814 ---- sys_set_audio_api(API_ASIO); #else ! NOT_HERE; #endif sys_mmio = 0; *************** *** 820,824 **** sys_set_audio_api(API_MMIO); #else ! NOT_HERE("-mmio"); #endif sys_mmio = 1; --- 820,824 ---- sys_set_audio_api(API_MMIO); #else ! NOT_HERE; #endif sys_mmio = 1;

1 0

pd/src configure, 1.6.2.13, 1.6.2.14 configure.in, 1.5.4.5.2.15, 1.5.4.5.2.16 makefile.in, 1.4.4.2.2.14, 1.4.4.2.2.15 s_midi.c, 1.4.4.1.2.11, 1.4.4.1.2.12
by Mathieu Bouchard 23 Nov '06

23 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32294 Modified Files: Tag: devel_0_39 configure configure.in makefile.in s_midi.c Log Message: i hope that DesireData's MIDI support is really fixed now. Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.14 retrieving revision 1.4.4.2.2.15 diff -C2 -d -r1.4.4.2.2.14 -r1.4.4.2.2.15 *** makefile.in 23 Nov 2006 17:50:53 -0000 1.4.4.2.2.14 --- makefile.in 23 Nov 2006 19:10:14 -0000 1.4.4.2.2.15 *************** *** 11,15 **** INCLUDE = -I. LDFLAGS = @LDFLAGS@ - LIB = @PDLIB@ OPT_CFLAGS = @OPT_CFLAGS@ WARN_CFLAGS = --- 11,14 ---- *************** *** 66,70 **** $(PDEXEC): $(OBJ) config.log ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB) $(BIN_DIR)/pd.tk: u_main.tk --- 65,69 ---- $(PDEXEC): $(OBJ) config.log ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(BIN_DIR)/pd.tk: u_main.tk Index: s_midi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v retrieving revision 1.4.4.1.2.11 retrieving revision 1.4.4.1.2.12 diff -C2 -d -r1.4.4.1.2.11 -r1.4.4.1.2.12 *** s_midi.c 23 Nov 2006 06:08:39 -0000 1.4.4.1.2.11 --- s_midi.c 23 Nov 2006 19:10:14 -0000 1.4.4.1.2.12 *************** *** 475,481 **** --- 475,483 ---- void midi_alsa_init( void); #endif + #ifndef USEAPI_PORTMIDI #ifdef USEAPI_OSS void midi_oss_init( void); #endif + #endif /* last requested parameters */ *************** *** 531,537 **** --- 533,541 ---- midi_alsa_init(); #endif + #ifndef USEAPI_PORTMIDI #ifdef USEAPI_OSS midi_oss_init(); #endif + #endif if (enable) #ifdef USEAPI_ALSA Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.13 retrieving revision 1.6.2.14 diff -C2 -d -r1.6.2.13 -r1.6.2.14 *** configure 23 Nov 2006 17:50:53 -0000 1.6.2.13 --- configure 23 Nov 2006 19:10:14 -0000 1.6.2.14 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi PDLIB MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 1309,1313 **** - USE_DEBUG_CFLAGS=no --- 1309,1312 ---- *************** *** 4298,4301 **** --- 4297,4320 ---- + # audio APIs may accumulate, but there must be only one MIDI API (??) + AUDIOSRC="" + MIDISRC="s_midi_none.c" + + if test `uname -s` = Linux; then + LDFLAGS="-Wl,-export-dynamic " + EXT=pd_linux + MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" + STRIPFLAG=-s + fi + + if test `uname -s` = Darwin; then + LDFLAGS="-Wl" + EXT=pd_darwin + MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" + STRIPFLAG="" + EXTERNTARGET=pd_darwin + fi + + if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 *************** *** 4363,4367 **** echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then ! PDLIB="$PDLIB -ldl" else echo "dynamic link support required" || exit 1 --- 4382,4386 ---- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then ! LDFLAGS="$LDFLAGS -ldl" else echo "dynamic link support required" || exit 1 *************** *** 4432,4436 **** echo "${ECHO_T}$ac_cv_lib_ffm_sin" >&6 if test $ac_cv_lib_ffm_sin = yes; then ! PDLIB="$PDLIB -lffm" fi --- 4451,4455 ---- echo "${ECHO_T}$ac_cv_lib_ffm_sin" >&6 if test $ac_cv_lib_ffm_sin = yes; then ! LDFLAGS="$LDFLAGS -lffm" fi *************** *** 4499,4503 **** echo "${ECHO_T}$ac_cv_lib_m_sin" >&6 if test $ac_cv_lib_m_sin = yes; then ! PDLIB="$PDLIB -lm" else echo "math library required" || exit 1 --- 4518,4522 ---- echo "${ECHO_T}$ac_cv_lib_m_sin" >&6 if test $ac_cv_lib_m_sin = yes; then ! LDFLAGS="$LDFLAGS -lm" else echo "math library required" || exit 1 *************** *** 4568,4572 **** echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 if test $ac_cv_lib_pthread_pthread_create = yes; then ! PDLIB="$PDLIB -lpthread" else echo "pthreads required" || exit 1 --- 4587,4591 ---- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 if test $ac_cv_lib_pthread_pthread_create = yes; then ! LDFLAGS="$LDFLAGS -lpthread" else echo "pthreads required" || exit 1 *************** *** 4785,4789 **** echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_info" >&6 if test $ac_cv_lib_asound_snd_pcm_info = yes; then ! PDLIB="$PDLIB -lasound" ; alsa="yes" else alsa="no" --- 4804,4808 ---- echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_info" >&6 if test $ac_cv_lib_asound_snd_pcm_info = yes; then ! LDFLAGS="$LDFLAGS -lasound" ; alsa="yes" else alsa="no" *************** *** 5065,5069 **** echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6 if test $ac_cv_lib_portaudio_Pa_GetDeviceCount = yes; then ! PDLIB=$PDLIB" -lportaudio" ; portaudio=yes else portaudio=no --- 5084,5088 ---- echo "${ECHO_T}$ac_cv_lib_portaudio_Pa_GetDeviceCount" >&6 if test $ac_cv_lib_portaudio_Pa_GetDeviceCount = yes; then ! LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes else portaudio=no *************** *** 5137,5141 **** echo "${ECHO_T}$ac_cv_lib_porttime_Pt_Started___" >&6 if test $ac_cv_lib_porttime_Pt_Started___ = yes; then ! PDLIB=$PDLIB" -lporttime" fi --- 5156,5160 ---- echo "${ECHO_T}$ac_cv_lib_porttime_Pt_Started___" >&6 if test $ac_cv_lib_porttime_Pt_Started___ = yes; then ! LDFLAGS=$LDFLAGS" -lporttime" fi *************** *** 5204,5208 **** echo "${ECHO_T}$ac_cv_lib_portmidi_Pm_Initialize" >&6 if test $ac_cv_lib_portmidi_Pm_Initialize = yes; then ! PDLIB=$PDLIB" -lportmidi" ; portmidi=yes else portmidi=no --- 5223,5227 ---- echo "${ECHO_T}$ac_cv_lib_portmidi_Pm_Initialize" >&6 if test $ac_cv_lib_portmidi_Pm_Initialize = yes; then ! LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes else portmidi=no *************** *** 5211,5221 **** fi - #---------------------------------------------------------------------------------- - # section 2: generate Makefile - # audio APIs may accumulate, but there must be only one MIDI API. - - AUDIOSRC="" - MIDISRC="s_midi_none.c" - if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" --- 5230,5233 ---- *************** *** 5224,5245 **** fi - if test `uname -s` = Linux; then - LDFLAGS="-Wl,-export-dynamic" - if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi - EXT=pd_linux - MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" - STRIPFLAG=-s - if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi - if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi - fi - - if test `uname -s` = Darwin; then - LDFLAGS="-Wl" - EXT=pd_darwin - MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" - STRIPFLAG="" - EXTERNTARGET=pd_darwin - fi - if test x$oss == xyes; then AUDIOSRC=$AUDIOSRC" s_audio_oss.c" --- 5236,5239 ---- *************** *** 5258,5261 **** --- 5252,5259 ---- AUDIOSRC=$AUDIOSRC" s_audio_jack.c" if test x$jack != xno; then + if test `uname -s` = Linux; then + if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi + if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi + fi if test `uname -s` = Darwin; then LDFLAGS=$LDFLAGS" -framework Jack" *************** *** 5278,5281 **** --- 5276,5280 ---- if test x$portmidi == xyes; then MIDISRC="s_midi_pm.c" + MIDIFLAGS="-DUSEAPI_PORTMIDI" if test `uname -s` = Darwin; then LDFLAGS=$LDFLAGS" -framework CoreMIDI" *************** *** 5283,5286 **** --- 5282,5287 ---- fi + MORECFLAGS=$MORECFLAGS" $MIDIFLAGS" + ac_config_files="$ac_config_files makefile" cat >confcache <<\_ACEOF *************** *** 5924,5928 **** s,@portaudio@,$portaudio,;t t s,@portmidi@,$portmidi,;t t - s,@PDLIB@,$PDLIB,;t t s,@MORECFLAGS@,$MORECFLAGS,;t t s,@EXT@,$EXT,;t t --- 5925,5928 ---- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.15 retrieving revision 1.5.4.5.2.16 diff -C2 -d -r1.5.4.5.2.15 -r1.5.4.5.2.16 *** configure.in 23 Nov 2006 17:50:53 -0000 1.5.4.5.2.15 --- configure.in 23 Nov 2006 19:10:14 -0000 1.5.4.5.2.16 *************** *** 5,10 **** # ./configure.in, but it's still put in the CVS and releases so that people don't # have to have autoconf installed. - # - # section 1: detect software. AC_INIT(d_arithmetic.c) --- 5,8 ---- *************** *** 14,18 **** AC_SUBST(portaudio, yes) AC_SUBST(portmidi, yes) - AC_SUBST(PDLIB) AC_SUBST(MORECFLAGS) AC_SUBST(EXT) --- 12,15 ---- *************** *** 56,69 **** AC_FUNC_ALLOCA ! dnl Checks for libraries. dnl Checking for `dlopen' function in -ldl: ! AC_CHECK_LIB(dl, dlopen,PDLIB="$PDLIB -ldl", echo "dynamic link support required" || exit 1) dnl Checking for `sin' function in -lffm (ffm is the fast math library on the alpha) ! AC_CHECK_LIB(ffm, sin,PDLIB="$PDLIB -lffm") dnl Checking for `sin' function in -lm: ! AC_CHECK_LIB(m, sin,PDLIB="$PDLIB -lm", echo "math library required" || exit 1) dnl Checking for `pthread_create' function in -pthread ! AC_CHECK_LIB(pthread, pthread_create,PDLIB="$PDLIB -lpthread", echo "pthreads required" || exit 1) if test x$oss == xyes; then --- 53,85 ---- AC_FUNC_ALLOCA ! # audio APIs may accumulate, but there must be only one MIDI API (??) ! AUDIOSRC="" ! MIDISRC="s_midi_none.c" ! ! if test `uname -s` = Linux; then ! LDFLAGS="-Wl,-export-dynamic " ! EXT=pd_linux ! MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" ! STRIPFLAG=-s ! fi ! ! if test `uname -s` = Darwin; then ! LDFLAGS="-Wl" ! EXT=pd_darwin ! MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" ! STRIPFLAG="" ! EXTERNTARGET=pd_darwin ! fi ! ! if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi dnl Checking for `dlopen' function in -ldl: ! AC_CHECK_LIB(dl, dlopen,LDFLAGS="$LDFLAGS -ldl", echo "dynamic link support required" || exit 1) dnl Checking for `sin' function in -lffm (ffm is the fast math library on the alpha) ! AC_CHECK_LIB(ffm, sin,LDFLAGS="$LDFLAGS -lffm") dnl Checking for `sin' function in -lm: ! AC_CHECK_LIB(m, sin,LDFLAGS="$LDFLAGS -lm", echo "math library required" || exit 1) dnl Checking for `pthread_create' function in -pthread ! AC_CHECK_LIB(pthread, pthread_create,LDFLAGS="$LDFLAGS -lpthread", echo "pthreads required" || exit 1) if test x$oss == xyes; then *************** *** 73,77 **** dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. if test x$alsa == xyes; then ! AC_CHECK_LIB(asound,snd_pcm_info,PDLIB="$PDLIB -lasound" ; alsa="yes",alsa="no") fi --- 89,93 ---- dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. if test x$alsa == xyes; then ! AC_CHECK_LIB(asound,snd_pcm_info,LDFLAGS="$LDFLAGS -lasound" ; alsa="yes",alsa="no") fi *************** *** 84,102 **** dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. if test x$portaudio == xyes; then ! AC_CHECK_LIB(portaudio,Pa_GetDeviceCount,PDLIB=$PDLIB" -lportaudio" ; portaudio=yes,portaudio=no) fi if test x$portmidi == xyes; then ! AC_CHECK_LIB(porttime,Pt_Started ,PDLIB=$PDLIB" -lporttime") ! AC_CHECK_LIB(portmidi,Pm_Initialize,PDLIB=$PDLIB" -lportmidi" ; portmidi=yes,portmidi=no) fi - #---------------------------------------------------------------------------------- - # section 2: generate Makefile - # audio APIs may accumulate, but there must be only one MIDI API. - - AUDIOSRC="" - MIDISRC="s_midi_none.c" - if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" --- 100,111 ---- dnl This should be fixed so Pd can use ALSA shared libraries where appropriate. if test x$portaudio == xyes; then ! AC_CHECK_LIB(portaudio,Pa_GetDeviceCount,LDFLAGS=$LDFLAGS" -lportaudio" ; portaudio=yes,portaudio=no) fi if test x$portmidi == xyes; then ! AC_CHECK_LIB(porttime,Pt_Started ,LDFLAGS=$LDFLAGS" -lporttime") ! AC_CHECK_LIB(portmidi,Pm_Initialize,LDFLAGS=$LDFLAGS" -lportmidi" ; portmidi=yes,portmidi=no) fi if test x$USE_DEBUG_CFLAGS == xyes; then OPT_CFLAGS="-O1 -g" *************** *** 105,126 **** fi - if test `uname -s` = Linux; then - LDFLAGS="-Wl,-export-dynamic" - if test "$static" = yes; then LDFLAGS="$LDFLAGS -static"; fi - EXT=pd_linux - MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" - STRIPFLAG=-s - if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi - if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi - fi - - if test `uname -s` = Darwin; then - LDFLAGS="-Wl" - EXT=pd_darwin - MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" - STRIPFLAG="" - EXTERNTARGET=pd_darwin - fi - if test x$oss == xyes; then AUDIOSRC=$AUDIOSRC" s_audio_oss.c" --- 114,117 ---- *************** *** 139,142 **** --- 130,137 ---- AUDIOSRC=$AUDIOSRC" s_audio_jack.c" if test x$jack != xno; then + if test `uname -s` = Linux; then + if test x$jack == "xyes"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi + if test x$jack == "xrun"; then LDFLAGS=$LDFLAGS" -lrt -ljack"; fi + fi if test `uname -s` = Darwin; then LDFLAGS=$LDFLAGS" -framework Jack" *************** *** 159,162 **** --- 154,158 ---- if test x$portmidi == xyes; then MIDISRC="s_midi_pm.c" + MIDIFLAGS="-DUSEAPI_PORTMIDI" if test `uname -s` = Darwin; then LDFLAGS=$LDFLAGS" -framework CoreMIDI" *************** *** 164,167 **** --- 160,165 ---- fi + MORECFLAGS=$MORECFLAGS" $MIDIFLAGS" + AC_OUTPUT(makefile)

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
57
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 November 2006