summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2003-11-12 00:55:19 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2003-11-12 00:55:19 +0000
commitbdf11b37cd6c55ea567625acb03ec218a108c63f (patch)
treeb5b6a8b55a80c88bb4af94707bbcec10267bf97c /audio
parentadd jfreechart 0.9.13 (diff)
Update to 0.37-1test1. Use Tk/Tcl 8.4 instead of 8.3.
to do: the "Help -> About pd" and "Media -> Test Audio and MIDI" menu items do not work because the port installs files where they are not found by the program
Diffstat (limited to 'audio')
-rw-r--r--audio/pd/Makefile27
-rw-r--r--audio/pd/distinfo2
-rw-r--r--audio/pd/files/patch-src_configure.in43
-rw-r--r--audio/pd/files/patch-src_m_conf.c22
-rw-r--r--audio/pd/files/patch-src_m_glob.c30
-rw-r--r--audio/pd/files/patch-src_m_sched.c42
-rw-r--r--audio/pd/files/patch-src_s_audio.c13
-rw-r--r--audio/pd/files/patch-src_s_audio_oss.c13
-rw-r--r--audio/pd/files/patch-src_s_freebsd.c45
-rw-r--r--audio/pd/files/patch-src_s_inter.c15
-rw-r--r--audio/pd/files/patch-src_s_main.c15
-rw-r--r--audio/pd/files/patch-src_s_stuff.h15
12 files changed, 223 insertions, 59 deletions
diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index 2325730546c0..314127b362fc 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -6,39 +6,40 @@
#
PORTNAME= pd
-PORTVERSION= 0.36.0
+PORTVERSION= 0.37
CATEGORIES= audio
MASTER_SITES= http://www-crca.ucsd.edu/~msp/Software/
-DISTNAME= pd-0.36-0.linux
+DISTNAME= pd-0.37-1test1.src
MAINTAINER= trevor@FreeBSD.org
COMMENT= Pure Data, a MIDI-capable real-time audio processor/synthesizer
-LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83 \
- tk83:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 \
+ tk84:${PORTSDIR}/x11-toolkits/tk84
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
- LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -ltk83 -ltcl83"
+ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -ltk84 -ltcl84"
MAKEFILE= makefile
MAN1= pd.1 pdreceive.1 pdsend.1
PATCH_WRKSRC= ${WRKSRC}/..
PLIST= ${WRKDIR}/pkg-plist
USE_GMAKE= yes
USE_X_PREFIX= yes
-WRKSRC= ${WRKDIR}/pd-0.36-0/src
+USE_AUTOCONF= yes
+WANT_AUTOCONF_VER= 257
+WRKSRC= ${WRKDIR}/pd-0.37-1test1/src
pre-patch:
- ${CP} ${WRKSRC}/s_linux.c ${WRKSRC}/s_freebsd.c
-
-pre-configure:
- ${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT}
+ ${RM} -f ${WRKSRC}/configure
post-configure:
- ${CP} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
- ${SED} -e "s:^INCLUDE = :INCLUDE = -I${LOCALBASE}/include/tk8.3 \
- -I${LOCALBASE}/include/tcl8.3 -I${X11BASE}/include :g; \
+ ${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
+ ${SED} -e "s:^INCLUDE = :INCLUDE = -I${LOCALBASE}/include/tk8.4 \
+ -I${LOCALBASE}/include/tcl8.4 -I${X11BASE}/include :g; \
s:^LIB =:LIB =${PTHREAD_LIBS}:g; \
+ s:GFLAGS = :GFLAGS = -DUSEAPI_OSS :g; \
+ s:x_midi.c ::g; s:s_midi.c ::g; \
s:^CFLAGS =:CFLAGS+=${PTHREAD_CFLAGS}:g" \
< ${WRKSRC}/makefile.orig > ${WRKSRC}/makefile
diff --git a/audio/pd/distinfo b/audio/pd/distinfo
index 05423b2b888e..ec70a419add5 100644
--- a/audio/pd/distinfo
+++ b/audio/pd/distinfo
@@ -1,2 +1,2 @@
$FreeBSD$
-MD5 (pd-0.36-0.linux.tar.gz) = 8d78b4b31f0161a08894374f16a6b83c
+MD5 (pd-0.37-1test1.src.tar.gz) = 6f1f24d17b32bdd566fd5090a09c77f4
diff --git a/audio/pd/files/patch-src_configure.in b/audio/pd/files/patch-src_configure.in
new file mode 100644
index 000000000000..51458a9f3edb
--- /dev/null
+++ b/audio/pd/files/patch-src_configure.in
@@ -0,0 +1,43 @@
+$FreeBSD$
+
+--- src/configure.in.orig Fri Sep 26 21:40:18 2003
++++ src/configure.in Tue Nov 11 23:53:26 2003
+@@ -136,6 +136,38 @@
+ AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
+
+
++if test `uname -s` = FreeBSD;
++then
++ EXT=pd_freebsd
++ MORECFLAGS="-DPA_USE_OSS -DPA_LITTLE_ENDIAN \
++ -DUSEAPI_OSS \
++ -I../portaudio/pa_common \
++ -I../portaudio/pablio -I../portaudio/portmidi-macosx \
++ -Werror -fno-strict-aliasing"
++ SYSSRC="s_audio_oss.c"
++ if test x$portaudio == "xyes";
++ then
++ MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS
++ SYSSRC="s_audio_pa.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/pablio/pablio_pd.c \
++ ../portaudio/pablio/ringbuffer_pd.c \
++ ../portaudio/pa_unix/pa_unix_hostapis.c \
++ ../portaudio/pa_unix/pa_unix_util.c \
++ ../portaudio/pa_unix_oss/pa_unix_oss.c "$SYSSRC
++ fi
++ GUINAME="pd-gui"
++ OSNUMBER=0
++fi
++
+ if test `uname -s` = Linux;
+ then
+ dnl Ckecking for ALSA
diff --git a/audio/pd/files/patch-src_m_conf.c b/audio/pd/files/patch-src_m_conf.c
new file mode 100644
index 000000000000..5c7946cb966a
--- /dev/null
+++ b/audio/pd/files/patch-src_m_conf.c
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- src/m_conf.c.orig Fri Mar 21 04:46:29 2003
++++ src/m_conf.c Tue Nov 11 22:42:47 2003
+@@ -32,7 +32,7 @@ void x_interface_setup(void);
+ void x_connective_setup(void);
+ void x_time_setup(void);
+ void x_arithmetic_setup(void);
+-void x_midi_setup(void);
++//void x_midi_setup(void);
+ void x_misc_setup(void);
+ void x_net_setup(void);
+ void x_qlist_setup(void);
+@@ -78,7 +78,7 @@ void conf_init(void)
+ x_connective_setup();
+ x_time_setup();
+ x_arithmetic_setup();
+- x_midi_setup();
++// x_midi_setup();
+ x_misc_setup();
+ x_net_setup();
+ x_qlist_setup();
diff --git a/audio/pd/files/patch-src_m_glob.c b/audio/pd/files/patch-src_m_glob.c
new file mode 100644
index 000000000000..e9c38711ee13
--- /dev/null
+++ b/audio/pd/files/patch-src_m_glob.c
@@ -0,0 +1,30 @@
+$FreeBSD$
+
+--- src/m_glob.c.orig Thu Jul 31 20:48:15 2003
++++ src/m_glob.c Tue Nov 11 22:43:27 2003
+@@ -21,8 +21,8 @@ void glob_finderror(t_pd *dummy);
+ void glob_audio_properties(t_pd *dummy, t_floatarg flongform);
+ void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
+ void glob_audio_setapi(t_pd *dummy, t_floatarg f);
+-void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
+-void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
++//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
++//void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
+ void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);
+ void glob_path_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
+ void glob_ping(t_pd *dummy);
+@@ -89,10 +89,10 @@ void glob_init(void)
+ gensym("audio-dialog"), A_GIMME, 0);
+ class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,
+ gensym("audio-setapi"), A_FLOAT, 0);
+- class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
+- gensym("midi-properties"), A_DEFFLOAT, 0);
+- class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
+- gensym("midi-dialog"), A_GIMME, 0);
++// class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
++// gensym("midi-properties"), A_DEFFLOAT, 0);
++// class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
++// gensym("midi-dialog"), A_GIMME, 0);
+ class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,
+ gensym("start-path-dialog"), A_DEFFLOAT, 0);
+ class_addmethod(glob_pdobject, (t_method)glob_path_dialog,
diff --git a/audio/pd/files/patch-src_m_sched.c b/audio/pd/files/patch-src_m_sched.c
new file mode 100644
index 000000000000..b730945e2124
--- /dev/null
+++ b/audio/pd/files/patch-src_m_sched.c
@@ -0,0 +1,42 @@
+$FreeBSD$
+
+--- src/m_sched.c.orig Wed Aug 27 18:02:19 2003
++++ src/m_sched.c Tue Nov 11 22:45:18 2003
+@@ -377,8 +377,8 @@ call. This call returns true if samples
+ the audio I/O system is still busy with previous transfers.
+ */
+
+-void sys_pollmidiqueue( void);
+-void sys_initmidiqueue( void);
++//void sys_pollmidiqueue( void);
++//void sys_initmidiqueue( void);
+
+ int m_scheduler( void)
+ {
+@@ -398,7 +398,7 @@ int m_scheduler( void)
+ sys_sleepgrain = 100;
+ else if (sys_sleepgrain > 5000)
+ sys_sleepgrain = 5000;
+- sys_initmidiqueue();
++// sys_initmidiqueue();
+ while (1)
+ {
+ int didsomething = 0;
+@@ -440,7 +440,7 @@ int m_scheduler( void)
+ timeforward = SENDDACS_YES;
+ else timeforward = SENDDACS_NO;
+ }
+- sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
++// sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
+ sys_addhist(1);
+ if (timeforward != SENDDACS_NO)
+ sched_tick(sys_time + sys_time_per_dsp_tick);
+@@ -448,7 +448,7 @@ int m_scheduler( void)
+ didsomething = 1;
+
+ sys_addhist(2);
+- sys_pollmidiqueue();
++// sys_pollmidiqueue();
+ if (sys_pollgui())
+ {
+ if (!didsomething)
diff --git a/audio/pd/files/patch-src_s_audio.c b/audio/pd/files/patch-src_s_audio.c
new file mode 100644
index 000000000000..2417abf6ef3d
--- /dev/null
+++ b/audio/pd/files/patch-src_s_audio.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/s_audio.c.orig Sat Oct 18 05:32:24 2003
++++ src/s_audio.c Tue Nov 11 22:46:57 2003
+@@ -716,7 +716,7 @@ void sys_listdevs(void )
+ #endif
+ post("unknown API");
+
+- sys_listmididevs();
++// sys_listmididevs();
+ }
+
+ void sys_setblocksize(int n)
diff --git a/audio/pd/files/patch-src_s_audio_oss.c b/audio/pd/files/patch-src_s_audio_oss.c
new file mode 100644
index 000000000000..50ecfec7b0b8
--- /dev/null
+++ b/audio/pd/files/patch-src_s_audio_oss.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- src/s_audio_oss.c.orig Sat Oct 18 22:44:55 2003
++++ src/s_audio_oss.c Tue Nov 11 21:15:24 2003
+@@ -5,7 +5,7 @@
+
+ /* this file inputs and outputs audio using the OSS API available on linux. */
+
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+
+ #include "m_pd.h"
+ #include "s_stuff.h"
diff --git a/audio/pd/files/patch-src_s_freebsd.c b/audio/pd/files/patch-src_s_freebsd.c
deleted file mode 100644
index a2bf2753268a..000000000000
--- a/audio/pd/files/patch-src_s_freebsd.c
+++ /dev/null
@@ -1,45 +0,0 @@
-$FreeBSD$
-
---- src/s_freebsd.c.orig Sun Sep 28 15:48:40 2003
-+++ src/s_freebsd.c Sun Sep 28 15:48:41 2003
-@@ -32,7 +32,8 @@
- * 1311:forum::für::umläute:2001
- */
-
--#include <linux/soundcard.h>
-+#include <sys/soundcard.h>
-+#include <sys/mman.h>
-
- #if (defined(ALSA01) || defined(ALSA99))
- #define ALSA
-@@ -765,9 +766,11 @@
- #endif
-
- #ifdef _POSIX_MEMLOCK
-+#if _POSIX_MEMLOCK != -1
- if (mlockall(MCL_FUTURE) != -1)
- fprintf(stderr, "memory locking enabled.\n");
- #endif
-+#endif
- }
-
- /* ------------ linux-specific command-line flags -------------- */
-@@ -868,7 +871,8 @@
- }
- else
- {
-- wantformat = AFMT_S16_NE;
-+/* FreeBSD's soundcard.h does not define AFMT_S16_NE */
-+ wantformat = AFMT_S16_BE;
- dev->d_bytespersamp = 2;
- }
- param = wantformat;
-@@ -2750,7 +2754,7 @@
-
- /* use ctrlpanel to change, experiment, channels 1 */
-
-- orig = param = AFMT_S16_NE;
-+ orig = param = AFMT_S16_BE;
- if (ioctl(fd,SNDCTL_DSP_SETFMT,&param) == -1)
- fprintf(stderr,"RME9652: Could not set DSP format\n");
- else if( orig != param )
diff --git a/audio/pd/files/patch-src_s_inter.c b/audio/pd/files/patch-src_s_inter.c
new file mode 100644
index 000000000000..4fb62ac68d02
--- /dev/null
+++ b/audio/pd/files/patch-src_s_inter.c
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- src/s_inter.c.orig Mon Jul 28 16:49:04 2003
++++ src/s_inter.c Tue Nov 11 22:46:26 2003
+@@ -893,8 +893,8 @@ void sys_bail(int n)
+ #ifndef __linux /* sys_close_audio() hangs if you're in a signal? */
+ fprintf(stderr, "closing audio...\n");
+ sys_close_audio();
+- fprintf(stderr, "closing MIDI...\n");
+- sys_close_midi();
++// fprintf(stderr, "closing MIDI...\n");
++// sys_close_midi();
+ fprintf(stderr, "... done.\n");
+ #endif
+ exit(1);
diff --git a/audio/pd/files/patch-src_s_main.c b/audio/pd/files/patch-src_s_main.c
new file mode 100644
index 000000000000..081c0fd98d4a
--- /dev/null
+++ b/audio/pd/files/patch-src_s_main.c
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- src/s_main.c.orig Wed Oct 29 20:38:54 2003
++++ src/s_main.c Tue Nov 11 22:45:46 2003
+@@ -253,8 +253,8 @@ int sys_main(int argc, char **argv)
+ if (sys_startgui(sys_guidir->s_name)) /* start the gui */
+ return(1);
+ /* open audio and MIDI */
+- sys_open_midi(sys_nmidiin, sys_midiindevlist,
+- sys_nmidiout, sys_midioutdevlist);
++// sys_open_midi(sys_nmidiin, sys_midiindevlist,
++// sys_nmidiout, sys_midioutdevlist);
+ sys_open_audio(sys_nsoundin, sys_soundindevlist, sys_nchin, sys_chinlist,
+ sys_nsoundout, sys_soundoutdevlist, sys_nchout, sys_choutlist,
+ sys_main_srate, sys_main_advance, 1);
diff --git a/audio/pd/files/patch-src_s_stuff.h b/audio/pd/files/patch-src_s_stuff.h
new file mode 100644
index 000000000000..deaee7264455
--- /dev/null
+++ b/audio/pd/files/patch-src_s_stuff.h
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- src/s_stuff.h.orig Thu Jul 31 18:26:16 2003
++++ src/s_stuff.h Tue Nov 11 21:50:10 2003
+@@ -131,10 +131,8 @@
+ #define API_PORTAUDIO 4
+ #define API_JACK 5
+
+-#ifdef __linux__
+ #define API_DEFAULT API_OSS
+ #define API_DEFSTRING "OSS"
+-#endif
+ #ifdef MSW
+ #define API_DEFAULT API_MMIO
+ #define API_DEFSTRING "MMIO"