Attachment #133553 for bug #178027




# $FreeBSD: head/audio/pd/Makefile 316287 2013-04-22 23:19:08Z bapt $

PORTNAME=	pd
DISTVERSION=	0.44-3
DISTVERSIONSUFFIX=	.src
CATEGORIES=	audio
#MASTER_SITES=	SF/pure-data/pure-data/${PORTVERSION}
MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	MIDI-capable real-time audio processor/synthesizer

LICENSE=	BSD

RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
		dejavu>0:${PORTSDIR}/x11-fonts/dejavu

OPTIONS_DEFINE=	ALSA FFTW JACK DOCS
OPTIONS_DEFAULT=FFTW

WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}

USES=		gettext pkgconfig
USE_TK_WRAPPER=	yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	aclocal libtoolize autoconf automake
ACLOCAL_ARGS=	-I m4/generated -I m4

		 /^libpddir/s|=.*|= $$(pkglibdir)| ; \
		 s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile.am
	@${REINPLACE_CMD} -e \
		'/^pd_LDADD/s| =.*| = $$(LIBM)|' ${WRKSRC}/src/Makefile.am
		 s| x_midi.c|| ; \
		 s| s_midi.c|| ; \
		 s| s_midi_alsa.c|| ; \
		 s| s_midi_oss.c||g' ${WRKSRC}/src/Makefile.am
	@${REINPLACE_CMD} -e \
		's|PD_BASEDIR/LICENSE|${DOCSDIR}/LICENSE|g ; \
		 s|PD_BASEDIR/doc/1|${DOCSDIR}/1|g' \

Lines 1-2 Link Here

(-)audio/pd/distinfo (-2 / +2 lines)
1	SHA256 (pd-0.44-2.src.tar.gz) = 595908d7d5678e3f80ed1b6b37b41c9b5e22472893b1f489decfc805f56ee804	1	SHA256 (pd-0.44-3.src.tar.gz) = 242745f16bf27838150120022a8f5b63ea5c69441c305dcf637242686f615317
2	SIZE (pd-0.44-2.src.tar.gz) = 2201154	2	SIZE (pd-0.44-3.src.tar.gz) = 2200542




$FreeBSD: head/audio/pd/files/patch-src_m_conf.c 300895 2012-07-14 12:56:14Z beat $

--- 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);
@@ -79,7 +79,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();




$FreeBSD: head/audio/pd/files/patch-src_m_glob.c 300895 2012-07-14 12:56:14Z beat $

--- src/m_glob.c.orig	Sun Mar 25 00:37:25 2007
+++ src/m_glob.c	Sun Mar 25 00:38:40 2007
@@ -21,9 +21,9 @@
 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_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_setapi(t_pd *dummy, t_floatarg f);
 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_start_startup_dialog(t_pd *dummy, t_floatarg flongform);
@@ -96,12 +96,12 @@
         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_setapi,
-        gensym("midi-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_setapi,
+    //        gensym("midi-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_start_path_dialog,
         gensym("start-path-dialog"), 0);
     class_addmethod(glob_pdobject, (t_method)glob_path_dialog,




--- src/m_sched.c.orig	2011-03-10 15:02:41.000000000 +0900
+++ src/m_sched.c	2011-04-06 19:40:16.000000000 +0900
@@ -394,8 +394,10 @@
 the audio I/O system is still busy with previous transfers.
 */
 
+#if !defined(__FreeBSD__)
 void sys_pollmidiqueue( void);
 void sys_initmidiqueue( void);
+#endif
 
  /* sys_idlehook is a hook the user can fill in to grab idle time.  Return
 nonzero if you actually used the time; otherwise we're really really idle and
@@ -419,7 +421,9 @@
         sys_sleepgrain = 100;
     else if (sys_sleepgrain > 5000)
         sys_sleepgrain = 5000;
+#if !defined(__FreeBSD__)
     sys_initmidiqueue();
+#endif
     while (!sys_quit)
     {
         int didsomething = 0;
@@ -476,7 +480,9 @@
                     timeforward = SENDDACS_YES;
             else timeforward = SENDDACS_NO;
         }
+#if !defined(__FreeBSD__)
         sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
+#endif
         sys_addhist(1);
         if (timeforward != SENDDACS_NO)
             sched_tick(sys_time + sys_time_per_dsp_tick);
@@ -484,7 +490,9 @@
             didsomething = 1;
 
         sys_addhist(2);
+#if !defined(__FreeBSD__)
         sys_pollmidiqueue();
+#endif
         if (sys_pollgui())
         {
             if (!didsomething)
@@ -523,11 +531,15 @@
 void sched_audio_callbackfn(void)
 {
     sys_lock();
+#if !defined(__FreeBSD__)
     sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
+#endif
     sys_addhist(1);
     sched_tick(sys_time + sys_time_per_dsp_tick);
     sys_addhist(2);
+#if !defined(__FreeBSD__)
     sys_pollmidiqueue();
+#endif
     sys_addhist(3);
     sys_pollgui();
     sys_addhist(5);
@@ -538,7 +550,9 @@
 
 static void m_callbackscheduler(void)
 {
+#if !defined(__FreeBSD__)
     sys_initmidiqueue();
+#endif
     while (!sys_quit)
     {
         double timewas = sys_time;




$FreeBSD: head/audio/pd/files/patch-src_s_audio.c 300895 2012-07-14 12:56:14Z beat $

--- 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)




--- src/s_file.c.orig	Sat Dec 31 21:08:37 2005
+++ src/s_file.c	Sun Mar 25 01:47:57 2007
@@ -339,7 +339,7 @@
             break;
         nmidioutdev++;
     }
-    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
+//    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
 
         /* search path */
     if (sys_getpreference("npath", prefbuf, MAXPDSTRING))
@@ -397,8 +397,8 @@
     int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
     int i, rate, advance;
     char buf1[MAXPDSTRING], buf2[MAXPDSTRING];
-    int nmidiindev, midiindev[MAXMIDIINDEV];
-    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
+//    int nmidiindev, midiindev[MAXMIDIINDEV];
+//    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
 
     sys_initsavepreferences();
 
@@ -431,7 +431,7 @@
     sprintf(buf1, "%d", rate);
     sys_putpreference("rate", buf1);
 
-        /* MIDI settings */
+        /* MIDI settings
     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
     sys_putpreference("nomidiin", (nmidiindev <= 0 ? "True" : "False"));
     for (i = 0; i < nmidiindev; i++)
@@ -447,6 +447,7 @@
         sprintf(buf2, "%d", midioutdev[i]);
         sys_putpreference(buf1, buf2);
     }
+    */
         /* file search path */
 
     for (i = 0; 1; i++)




--- src/s_inter.c.orig	2011-03-20 07:22:27.000000000 +0900
+++ src/s_inter.c	2011-04-06 20:20:35.000000000 +0900
@@ -1251,7 +1251,11 @@
              sys_gui("pdtk_watchdog\n");
 #endif
          sys_get_audio_apis(buf);
+#if defined(__FreeBSD__)
+         strcpy(buf2, "{}");
+#else
          sys_get_midi_apis(buf2);
+#endif
          sys_set_searchpath();     /* tell GUI about path and startup flags */
          sys_set_extrapath();
          sys_set_startup();




--- src/s_main.c.orig	2011-03-07 10:11:02.000000000 +0900
+++ src/s_main.c	2011-04-06 19:30:04.000000000 +0900
@@ -300,7 +300,9 @@
     else
     {
             /* open audio and MIDI */
+#if !defined(__FreeBSD__)
         sys_reopen_midi();
+#endif
         sys_reopen_audio();
             /* run scheduler until it quits */
         return (m_mainloop());
@@ -628,7 +630,9 @@
         }
         else if (!strcmp(*argv, "-alsamidi"))
         {
+#if !defined(__FreeBSD__)
           sys_set_midi_api(API_ALSA);
+#endif
             argc--; argv++;
         }
 #endif
@@ -936,7 +940,11 @@
             /* add "doc/5.reference" library to helppath */
     strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);

     sys_helppath = namelist_append_files(sys_helppath, sbuf);
         /* correct to make audio and MIDI device lists zero based.  On
         MMIO, however, "1" really means the second device (the first one
@@ -990,7 +998,9 @@
         for (i = 0; i < naudiooutdev; i++)
             audiooutdev[i] = sys_soundoutdevlist[i];
     }
+#if !defined(__FreeBSD__)
     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
+#endif
     if (sys_nmidiin >= 0)
     {
         post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
@@ -1015,7 +1025,9 @@
     sys_set_audio_settings(naudioindev, audioindev, nchindev, chindev,
         naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 
         callback, blocksize);
+#if !defined(__FreeBSD__)
     sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
+#endif
 }
 
 static void sys_addreferencepath(void)

Lines 392-399 Link Here

(-)audio/pd/pkg-plist (-1 / +1 lines)
392	%%PORTDOCS%%%%DOCSDIR%%/5.reference/graph-help.pd	392	%%PORTDOCS%%%%DOCSDIR%%/5.reference/graph-help.pd
393	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hdial-help.pd	393	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hdial-help.pd
394	%%PORTDOCS%%%%DOCSDIR%%/5.reference/help-intro.pd	394	%%PORTDOCS%%%%DOCSDIR%%/5.reference/help-intro.pd
395	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hradio-help.pd
396	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hip~-help.pd	395	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hip~-help.pd
		396	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hradio-help.pd
397	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hslider-help.pd	397	%%PORTDOCS%%%%DOCSDIR%%/5.reference/hslider-help.pd
398	%%PORTDOCS%%%%DOCSDIR%%/5.reference/int-help.pd	398	%%PORTDOCS%%%%DOCSDIR%%/5.reference/int-help.pd
399	%%PORTDOCS%%%%DOCSDIR%%/5.reference/key-help.pd	399	%%PORTDOCS%%%%DOCSDIR%%/5.reference/key-help.pd

Return to bug 178027

Lines 2-25 Link Here

(-)audio/pd/Makefile (-10 / +9 lines)
2	# $FreeBSD: head/audio/pd/Makefile 316287 2013-04-22 23:19:08Z bapt $	2	# $FreeBSD: head/audio/pd/Makefile 316287 2013-04-22 23:19:08Z bapt $
3		3
4	PORTNAME= pd	4	PORTNAME= pd
5	DISTVERSION= 0.44-2	5	DISTVERSION= 0.44-3
6	DISTVERSIONSUFFIX= .src	6	DISTVERSIONSUFFIX= .src
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF/pure-data/pure-data/${PORTVERSION} \	8	#MASTER_SITES= SF/pure-data/pure-data/${PORTVERSION}
9	http://www-crca.ucsd.edu/~msp/Software/	9	MASTER_SITES= http://www-crca.ucsd.edu/~msp/Software/
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
12	COMMENT= MIDI-capable real-time audio processor/synthesizer	12	COMMENT= MIDI-capable real-time audio processor/synthesizer
13		13
14	LICENSE= BSD	14	LICENSE= BSD
15		15
		16	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
		17	dejavu>0:${PORTSDIR}/x11-fonts/dejavu
		18
16	OPTIONS_DEFINE= ALSA FFTW JACK DOCS	19	OPTIONS_DEFINE= ALSA FFTW JACK DOCS
		20	OPTIONS_DEFAULT=FFTW
17		21
18	WRKSRC= ${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}	22	WRKSRC= ${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
19		23
20	USES= pkgconfig	24	USES= gettext pkgconfig
21	USE_TK_WRAPPER= yes	25	USE_TK_WRAPPER= yes
22	USE_GETTEXT= yes
23	USE_GMAKE= yes	26	USE_GMAKE= yes
24	USE_AUTOTOOLS= aclocal libtoolize autoconf automake	27	USE_AUTOTOOLS= aclocal libtoolize autoconf automake
25	ACLOCAL_ARGS= -I m4/generated -I m4	28	ACLOCAL_ARGS= -I m4/generated -I m4
Lines 74-84 Link Here
74	/^libpddir/s\|=.*\|= $$(pkglibdir)\| ; \	77	/^libpddir/s\|=.*\|= $$(pkglibdir)\| ; \
75	s\|make -C\|$$(MAKE) -C\|' ${WRKSRC}/Makefile.am	78	s\|make -C\|$$(MAKE) -C\|' ${WRKSRC}/Makefile.am
76	@${REINPLACE_CMD} -e \	79	@${REINPLACE_CMD} -e \
77	'/^pd_LDADD/s\| =.*\| = $$(LIBM)\| ; \	80	'/^pd_LDADD/s\| =.*\| = $$(LIBM)\|' ${WRKSRC}/src/Makefile.am
78	s\| x_midi.c\|\| ; \
79	s\| s_midi.c\|\| ; \
80	s\| s_midi_alsa.c\|\| ; \
81	s\| s_midi_oss.c\|\|g' ${WRKSRC}/src/Makefile.am
82	@${REINPLACE_CMD} -e \	81	@${REINPLACE_CMD} -e \
83	's\|PD_BASEDIR/LICENSE\|${DOCSDIR}/LICENSE\|g ; \	82	's\|PD_BASEDIR/LICENSE\|${DOCSDIR}/LICENSE\|g ; \
84	s\|PD_BASEDIR/doc/1\|${DOCSDIR}/1\|g' \	83	s\|PD_BASEDIR/doc/1\|${DOCSDIR}/1\|g' \

Lines 1-22 Link Here

(-)audio/pd/files/patch-src_m_conf.c (-22 lines)
1	$FreeBSD: head/audio/pd/files/patch-src_m_conf.c 300895 2012-07-14 12:56:14Z beat $
2
3	--- src/m_conf.c.orig Fri Mar 21 04:46:29 2003
4	+++ src/m_conf.c Tue Nov 11 22:42:47 2003
5	@@ -32,7 +32,7 @@ void x_interface_setup(void);
6	void x_connective_setup(void);
7	void x_time_setup(void);
8	void x_arithmetic_setup(void);
9	-void x_midi_setup(void);
10	+//void x_midi_setup(void);
11	void x_misc_setup(void);
12	void x_net_setup(void);
13	void x_qlist_setup(void);
14	@@ -79,7 +79,7 @@ void conf_init(void)
15	x_connective_setup();
16	x_time_setup();
17	x_arithmetic_setup();
18	- x_midi_setup();
19	+// x_midi_setup();
20	x_misc_setup();
21	x_net_setup();
22	x_qlist_setup();

Lines 1-36 Link Here

(-)audio/pd/files/patch-src_m_glob.c (-36 lines)
1	$FreeBSD: head/audio/pd/files/patch-src_m_glob.c 300895 2012-07-14 12:56:14Z beat $
2
3	--- src/m_glob.c.orig Sun Mar 25 00:37:25 2007
4	+++ src/m_glob.c Sun Mar 25 00:38:40 2007
5	@@ -21,9 +21,9 @@
6	void glob_audio_properties(t_pd *dummy, t_floatarg flongform);
7	void glob_audio_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
8	void glob_audio_setapi(t_pd *dummy, t_floatarg f);
9	-void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
10	-void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
11	-void glob_midi_setapi(t_pd *dummy, t_floatarg f);
12	+//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
13	+//void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
14	+//void glob_midi_setapi(t_pd *dummy, t_floatarg f);
15	void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);
16	void glob_path_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
17	void glob_start_startup_dialog(t_pd *dummy, t_floatarg flongform);
18	@@ -96,12 +96,12 @@
19	gensym("audio-dialog"), A_GIMME, 0);
20	class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,
21	gensym("audio-setapi"), A_FLOAT, 0);
22	- class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
23	- gensym("midi-setapi"), A_FLOAT, 0);
24	- class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
25	- gensym("midi-properties"), A_DEFFLOAT, 0);
26	- class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
27	- gensym("midi-dialog"), A_GIMME, 0);
28	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
29	+ // gensym("midi-setapi"), A_FLOAT, 0);
30	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
31	+ // gensym("midi-properties"), A_DEFFLOAT, 0);
32	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
33	+ // gensym("midi-dialog"), A_GIMME, 0);
34	class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,
35	gensym("start-path-dialog"), 0);
36	class_addmethod(glob_pdobject, (t_method)glob_path_dialog,

Lines 1-69 Link Here

(-)audio/pd/files/patch-src_m_sched.c (-69 lines)
1	--- src/m_sched.c.orig 2011-03-10 15:02:41.000000000 +0900
2	+++ src/m_sched.c 2011-04-06 19:40:16.000000000 +0900
3	@@ -394,8 +394,10 @@
4	the audio I/O system is still busy with previous transfers.
5	*/
6
7	+#if !defined(__FreeBSD__)
8	void sys_pollmidiqueue( void);
9	void sys_initmidiqueue( void);
10	+#endif
11
12	/* sys_idlehook is a hook the user can fill in to grab idle time. Return
13	nonzero if you actually used the time; otherwise we're really really idle and
14	@@ -419,7 +421,9 @@
15	sys_sleepgrain = 100;
16	else if (sys_sleepgrain > 5000)
17	sys_sleepgrain = 5000;
18	+#if !defined(__FreeBSD__)
19	sys_initmidiqueue();
20	+#endif
21	while (!sys_quit)
22	{
23	int didsomething = 0;
24	@@ -476,7 +480,9 @@
25	timeforward = SENDDACS_YES;
26	else timeforward = SENDDACS_NO;
27	}
28	+#if !defined(__FreeBSD__)
29	sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
30	+#endif
31	sys_addhist(1);
32	if (timeforward != SENDDACS_NO)
33	sched_tick(sys_time + sys_time_per_dsp_tick);
34	@@ -484,7 +490,9 @@
35	didsomething = 1;
36
37	sys_addhist(2);
38	+#if !defined(__FreeBSD__)
39	sys_pollmidiqueue();
40	+#endif
41	if (sys_pollgui())
42	{
43	if (!didsomething)
44	@@ -523,11 +531,15 @@
45	void sched_audio_callbackfn(void)
46	{
47	sys_lock();
48	+#if !defined(__FreeBSD__)
49	sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
50	+#endif
51	sys_addhist(1);
52	sched_tick(sys_time + sys_time_per_dsp_tick);
53	sys_addhist(2);
54	+#if !defined(__FreeBSD__)
55	sys_pollmidiqueue();
56	+#endif
57	sys_addhist(3);
58	sys_pollgui();
59	sys_addhist(5);
60	@@ -538,7 +550,9 @@
61
62	static void m_callbackscheduler(void)
63	{
64	+#if !defined(__FreeBSD__)
65	sys_initmidiqueue();
66	+#endif
67	while (!sys_quit)
68	{
69	double timewas = sys_time;

Lines 1-13 Link Here

(-)audio/pd/files/patch-src_s_audio.c (-13 lines)
1	$FreeBSD: head/audio/pd/files/patch-src_s_audio.c 300895 2012-07-14 12:56:14Z beat $
2
3	--- src/s_audio.c.orig Sat Oct 18 05:32:24 2003
4	+++ src/s_audio.c Tue Nov 11 22:46:57 2003
5	@@ -716,7 +716,7 @@ void sys_listdevs(void )
6	#endif
7	post("unknown API");
8
9	- sys_listmididevs();
10	+// sys_listmididevs();
11	}
12
13	void sys_setblocksize(int n)

Lines 1-39 Link Here

(-)audio/pd/files/patch-src_s_file.c (-39 lines)
1	--- src/s_file.c.orig Sat Dec 31 21:08:37 2005
2	+++ src/s_file.c Sun Mar 25 01:47:57 2007
3	@@ -339,7 +339,7 @@
4	break;
5	nmidioutdev++;
6	}
7	- sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
8	+// sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
9
10	/* search path */
11	if (sys_getpreference("npath", prefbuf, MAXPDSTRING))
12	@@ -397,8 +397,8 @@
13	int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
14	int i, rate, advance;
15	char buf1[MAXPDSTRING], buf2[MAXPDSTRING];
16	- int nmidiindev, midiindev[MAXMIDIINDEV];
17	- int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
18	+// int nmidiindev, midiindev[MAXMIDIINDEV];
19	+// int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
20
21	sys_initsavepreferences();
22
23	@@ -431,7 +431,7 @@
24	sprintf(buf1, "%d", rate);
25	sys_putpreference("rate", buf1);
26
27	- /* MIDI settings */
28	+ /* MIDI settings
29	sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
30	sys_putpreference("nomidiin", (nmidiindev <= 0 ? "True" : "False"));
31	for (i = 0; i < nmidiindev; i++)
32	@@ -447,6 +447,7 @@
33	sprintf(buf2, "%d", midioutdev[i]);
34	sys_putpreference(buf1, buf2);
35	}
36	+ */
37	/* file search path */
38
39	for (i = 0; 1; i++)

Lines 1-14 Link Here

(-)audio/pd/files/patch-src_s_inter.c (-14 lines)
1	--- src/s_inter.c.orig 2011-03-20 07:22:27.000000000 +0900
2	+++ src/s_inter.c 2011-04-06 20:20:35.000000000 +0900
3	@@ -1251,7 +1251,11 @@
4	sys_gui("pdtk_watchdog\n");
5	#endif
6	sys_get_audio_apis(buf);
7	+#if defined(__FreeBSD__)
8	+ strcpy(buf2, "{}");
9	+#else
10	sys_get_midi_apis(buf2);
11	+#endif
12	sys_set_searchpath(); /* tell GUI about path and startup flags */
13	sys_set_extrapath();
14	sys_set_startup();

Lines 1-25 Link Here

(-)audio/pd/files/patch-src_s_main.c (-40 lines)
1	--- src/s_main.c.orig 2011-03-07 10:11:02.000000000 +0900	1	--- src/s_main.c.orig 2011-03-07 10:11:02.000000000 +0900
2	+++ src/s_main.c 2011-04-06 19:30:04.000000000 +0900	2	+++ src/s_main.c 2011-04-06 19:30:04.000000000 +0900
3	@@ -300,7 +300,9 @@
4	else
5	{
6	/* open audio and MIDI */
7	+#if !defined(__FreeBSD__)
8	sys_reopen_midi();
9	+#endif
10	sys_reopen_audio();
11	/* run scheduler until it quits */
12	return (m_mainloop());
13	@@ -628,7 +630,9 @@
14	}
15	else if (!strcmp(*argv, "-alsamidi"))
16	{
17	+#if !defined(__FreeBSD__)
18	sys_set_midi_api(API_ALSA);
19	+#endif
20	argc--; argv++;
21	}
22	#endif
23	@@ -936,7 +940,11 @@	3	@@ -936,7 +940,11 @@
24	/* add "doc/5.reference" library to helppath */	4	/* add "doc/5.reference" library to helppath */
25	strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);	5	strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
Lines 32-54 Link Here
32	sys_helppath = namelist_append_files(sys_helppath, sbuf);	12	sys_helppath = namelist_append_files(sys_helppath, sbuf);
33	/* correct to make audio and MIDI device lists zero based. On	13	/* correct to make audio and MIDI device lists zero based. On
34	MMIO, however, "1" really means the second device (the first one	14	MMIO, however, "1" really means the second device (the first one
35	@@ -990,7 +998,9 @@
36	for (i = 0; i < naudiooutdev; i++)
37	audiooutdev[i] = sys_soundoutdevlist[i];
38	}
39	+#if !defined(__FreeBSD__)
40	sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
41	+#endif
42	if (sys_nmidiin >= 0)
43	{
44	post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
45	@@ -1015,7 +1025,9 @@
46	sys_set_audio_settings(naudioindev, audioindev, nchindev, chindev,
47	naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance,
48	callback, blocksize);
49	+#if !defined(__FreeBSD__)
50	sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
51	+#endif
52	}
53
54	static void sys_addreferencepath(void)