Update to 0.43.0

PR:		158494
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

7 files changed, 22 insertions, 92 deletions

diff --git a/audio/pd/files/patch-extra_pd_pd.c b/audio/pd/files/patch-extra_pd_pd.c
index 1568433b4a8d..cf95cdbeeec4 100644
--- a/audio/pd/files/patch-extra_pd_pd.c
+++ b/audio/pd/files/patch-extra_pd_pd.c
@@ -1,5 +1,5 @@
---- extra/pd~/pd~.c.orig	2008-12-12 01:29:02.000000000 +0900
-+++ extra/pd~/pd~.c	2009-01-12 01:36:46.000000000 +0900
+--- extra/pd~/pd~.c.orig	2010-07-29 05:55:17.000000000 +0900
++++ extra/pd~/pd~.c	2011-04-06 19:18:20.000000000 +0900
 @@ -11,6 +11,7 @@
  #include <stdlib.h>
  #include <errno.h>
@@ -8,12 +8,3 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
-@@ -47,7 +48,7 @@
- 
- #endif
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- #ifdef __x86_64__
- static char pd_tilde_dllextent[] = ".l_ia64",
-     pd_tilde_dllextent2[] = ".pd_linux";
diff --git a/audio/pd/files/patch-src_m_sched.c b/audio/pd/files/patch-src_m_sched.c
index f59e37e31bc0..98d0e6dde2f9 100644
--- a/audio/pd/files/patch-src_m_sched.c
+++ b/audio/pd/files/patch-src_m_sched.c
@@ -1,5 +1,5 @@
---- src/m_sched.c.orig	2008-03-15 09:03:00.000000000 +0900
-+++ src/m_sched.c	2008-08-23 22:07:34.000000000 +0900
+--- 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.
  */
@@ -41,10 +41,10 @@
          if (sys_pollgui())
          {
              if (!didsomething)
-@@ -522,11 +530,15 @@
- 
+@@ -523,11 +531,15 @@
  void sched_audio_callbackfn(void)
  {
+     sys_lock();
 +#if !defined(__FreeBSD__)
      sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
 +#endif
@@ -57,7 +57,7 @@
      sys_addhist(3);
      sys_pollgui();
      sys_addhist(5);
-@@ -536,7 +548,9 @@
+@@ -538,7 +550,9 @@
  
  static void m_callbackscheduler(void)
  {
@@ -66,4 +66,4 @@
 +#endif
      while (!sys_quit)
      {
- #ifdef MSW
+         double timewas = sys_time;
diff --git a/audio/pd/files/patch-src_s_audio_oss.c b/audio/pd/files/patch-src_s_audio_oss.c
deleted file mode 100644
index 50ecfec7b0b8..000000000000
--- a/audio/pd/files/patch-src_s_audio_oss.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$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_inter.c b/audio/pd/files/patch-src_s_inter.c
index 80c150152213..aab53df78ba8 100644
--- a/audio/pd/files/patch-src_s_inter.c
+++ b/audio/pd/files/patch-src_s_inter.c
@@ -1,15 +1,6 @@
---- src/s_inter.c.orig	2008-03-15 09:03:00.000000000 +0900
-+++ src/s_inter.c	2008-08-23 21:40:09.000000000 +0900
-@@ -839,7 +839,7 @@
- 
- static int sys_watchfd;
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- void glob_watchdog(t_pd *dummy)
- {
-     if (write(sys_watchfd, "\n", 1) < 1)
-@@ -1263,7 +1263,11 @@
+--- 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);
@@ -18,17 +9,6 @@
 +#else
           sys_get_midi_apis(buf2);
 +#endif
-          sys_vgui("pdtk_pd_startup {%s} %s %s {%s} %s\n", pd_version, buf, buf2, 
-                   sys_font, sys_fontweight); 
-     }
-@@ -1285,8 +1289,10 @@
- #ifndef __linux__  /* sys_close_audio() hangs if you're in a signal? */
-         fprintf(stderr, "closing audio...\n");
-         sys_close_audio();
-+#if !defined(__FreeBSD__)
-         fprintf(stderr, "closing MIDI...\n");
-         sys_close_midi();
-+#endif
-         fprintf(stderr, "... done.\n");
- #endif
-         exit(n);
+          sys_set_searchpath();     /* tell GUI about path and startup flags */
+          sys_set_extrapath();
+          sys_set_startup();
diff --git a/audio/pd/files/patch-src_s_main.c b/audio/pd/files/patch-src_s_main.c
index e97a92ed2928..09eadc1b4fcb 100644
--- a/audio/pd/files/patch-src_s_main.c
+++ b/audio/pd/files/patch-src_s_main.c
@@ -1,6 +1,6 @@
---- src/s_main.c.orig	2008-03-15 09:03:00.000000000 +0900
-+++ src/s_main.c	2008-08-23 21:44:26.000000000 +0900
-@@ -301,7 +301,9 @@
+--- 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 */
@@ -10,7 +10,7 @@
          sys_reopen_audio();
              /* run scheduler until it quits */
          return (m_mainloop());
-@@ -633,7 +635,9 @@
+@@ -628,7 +630,9 @@
          }
          else if (!strcmp(*argv, "-alsamidi"))
          {
@@ -20,7 +20,7 @@
              argc--; argv++;
          }
  #endif
-@@ -916,7 +920,11 @@
+@@ -936,7 +940,11 @@
              /* add "doc/5.reference" library to helppath */
      strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
      sbuf[MAXPDSTRING-30] = 0;
@@ -32,7 +32,7 @@
      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
-@@ -969,7 +977,9 @@
+@@ -990,7 +998,9 @@
          for (i = 0; i < naudiooutdev; i++)
              audiooutdev[i] = sys_soundoutdevlist[i];
      }
@@ -42,10 +42,10 @@
      if (sys_nmidiin >= 0)
      {
          post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
-@@ -992,7 +1002,9 @@
+@@ -1015,7 +1025,9 @@
      sys_set_audio_settings(naudioindev, audioindev, nchindev, chindev,
          naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 
-         callback);
+         callback, blocksize);
 +#if !defined(__FreeBSD__)
      sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
 +#endif
diff --git a/audio/pd/files/patch-src_s_stuff.h b/audio/pd/files/patch-src_s_stuff.h
deleted file mode 100644
index deaee7264455..000000000000
--- a/audio/pd/files/patch-src_s_stuff.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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"
diff --git a/audio/pd/files/patch-src_t_tkcmd.c b/audio/pd/files/patch-src_t_tkcmd.c
deleted file mode 100644
index 660552825eb8..000000000000
--- a/audio/pd/files/patch-src_t_tkcmd.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/t_tkcmd.c.orig	Sat Dec 31 21:08:37 2005
-+++ src/t_tkcmd.c	Sun Mar 25 12:12:15 2007
-@@ -50,6 +50,10 @@
- #define STARTGUI
- #endif
- 
-+#ifdef __FreeBSD__
-+#define STARTGUI
-+#endif
-+
- #define FIRSTPORTNUM 5600
- 
- void tcl_mess(char *s);