aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-08-20 04:04:44 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2010-08-20 04:04:44 +0000
commit77c97dd292f31801d2a9bf1cfc18555abd7d4bd2 (patch)
tree4b30955191c45bb08c54c49e5bcba8b69400cb0f
parent2ba291625b7f6ffc76c1b79fa5a29f81cd4b26b3 (diff)
various patches either incorporated or made obsolete by 0.43
svn path=/trunk/; revision=13865
-rw-r--r--packages/patches/allow_spaces_in_new_directory-0.41.4.patch14
-rw-r--r--packages/patches/fix_extra_for_mingw-0.42.5.patch74
-rw-r--r--packages/patches/fix_schedlib_loading-0.41.0.patch29
-rw-r--r--packages/patches/jack_fixes_0.41.4.patch102
-rw-r--r--packages/patches/object_arg_buffer_overflow_fix-0.41.4.patch11
-rw-r--r--packages/patches/s_path_buffer_overflow_fixes-0.41.4.patch22
-rw-r--r--packages/patches/spacesymbol-0.42.4.patch12
7 files changed, 0 insertions, 264 deletions
diff --git a/packages/patches/allow_spaces_in_new_directory-0.41.4.patch b/packages/patches/allow_spaces_in_new_directory-0.41.4.patch
deleted file mode 100644
index 9675a1f3..00000000
--- a/packages/patches/allow_spaces_in_new_directory-0.41.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: u_main.tk
-===================================================================
---- u_main.tk (revision 9735)
-+++ u_main.tk (working copy)
-@@ -413,7 +413,8 @@
- proc menu_new {} {
- global untitled_number
- global untitled_directory
-- pd [concat pd filename Untitled-$untitled_number $untitled_directory \;]
-+ pd [concat pd filename Untitled-$untitled_number \
-+ [pdtk_enquote $untitled_directory] \;]
- pd {
- #N canvas;
- #X pop 1;
diff --git a/packages/patches/fix_extra_for_mingw-0.42.5.patch b/packages/patches/fix_extra_for_mingw-0.42.5.patch
deleted file mode 100644
index 7267220b..00000000
--- a/packages/patches/fix_extra_for_mingw-0.42.5.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- branches/pd-extended/0.42/pd/extra/bonk~/bonk~.c 2009/06/08 15:04:10 11713
-+++ branches/pd-extended/0.42/pd/extra/bonk~/bonk~.c 2009/06/08 17:43:16 11714
-@@ -53,7 +53,7 @@
- #include <stdio.h>
- #include <string.h>
-
--#ifdef NT
-+#ifdef _MSC_VER
- #pragma warning (disable: 4305 4244)
- #endif
-
-@@ -82,7 +82,12 @@
- #endif
-
- #ifndef _MSC_VER
--#include <alloca.h>
-+# ifdef __MINGW32__
-+/* alloca is in malloc.h in MinGW */
-+# include <malloc.h>
-+# else
-+# include <alloca.h>
-+# endif
- #endif
-
- /* ------------------------ bonk~ ----------------------------- */
---- branches/pd-extended/0.42/pd/extra/fiddle~/fiddle~.c 2009/06/08 15:04:10 11713
-+++ branches/pd-extended/0.42/pd/extra/fiddle~/fiddle~.c 2009/06/08 17:43:16 11714
-@@ -28,7 +28,7 @@
- *
- */
-
--#ifdef NT
-+#ifdef _MSC_VER /* this is only needed with Microsoft's compiler */
- #define flog log
- #define fexp exp
- #define fsqrt sqrt
---- branches/pd-extended/0.42/pd/extra/pique/pique.c 2009/06/08 15:04:10 11713
-+++ branches/pd-extended/0.42/pd/extra/pique/pique.c 2009/06/08 17:43:16 11714
-@@ -7,7 +7,7 @@
- #include "m_pd.h"
- #include <math.h>
- #include <stdio.h>
--#ifdef NT
-+#ifdef _MSC_VER /* this is only needed with Microsoft's compiler */
- #pragma warning( disable : 4244 )
- #pragma warning( disable : 4305 )
- #endif
---- branches/pd-extended/0.42/pd/extra/sigmund~/sigmund~.c 2009/06/08 15:04:10 11713
-+++ branches/pd-extended/0.42/pd/extra/sigmund~/sigmund~.c 2009/06/08 17:43:16 11714
-@@ -13,7 +13,7 @@
- and usable in other contexts. The one external requirement is a real
- single-precision FFT, invoked as in the Mayer one: */
-
--#ifdef NT
-+#ifdef _MSC_VER /* this is only needed with Microsoft's compiler */
- __declspec(dllimport) extern
- #endif
- void mayer_realfft(int npoints, float *buf);
-@@ -26,13 +26,13 @@
- #include <math.h>
- #include <stdio.h>
- #include <string.h>
--#ifdef NT
-+#ifdef _WIN32
- #include <malloc.h>
- #else
- #include <alloca.h>
- #endif
- #include <stdlib.h>
--#ifdef NT
-+#ifdef _MSC_VER /* this is only needed with Microsoft's compiler */
- #pragma warning( disable : 4244 )
- #pragma warning( disable : 4305 )
- #endif
diff --git a/packages/patches/fix_schedlib_loading-0.41.0.patch b/packages/patches/fix_schedlib_loading-0.41.0.patch
deleted file mode 100644
index 29195e4d..00000000
--- a/packages/patches/fix_schedlib_loading-0.41.0.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- s_loader.orig 2008-03-12 11:19:15.000000000 -0400
-+++ s_loader.c 2008-03-12 11:18:09.000000000 -0400
-@@ -247,7 +247,7 @@
- typedef int (*t_externalschedlibmain)(const char *);
- t_externalschedlibmain externalmainfunc;
- char filename[MAXPDSTRING];
-- snprintf(filename, sizeof(filename), "%s.%s", externalschedlibname,
-+ snprintf(filename, sizeof(filename), "%s%s", externalschedlibname,
- sys_dllextent);
- sys_bashfilename(filename, filename);
- #ifdef MSW
-@@ -255,7 +255,7 @@
- HINSTANCE ntdll = LoadLibrary(filename);
- if (!ntdll)
- {
-- post("%s: couldn't load external scheduler lib ", filename);
-+ fprintf(stderr, "%s: couldn't load external scheduler lib ", filename);
- return (0);
- }
- externalmainfunc =
-@@ -266,7 +266,7 @@
- void *dlobj = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
- if (!dlobj)
- {
-- post("%s: %s", filename, dlerror());
-+ fprintf(stderr, "%s: %s\n", filename, dlerror());
- return (0);
- }
- externalmainfunc = (t_externalschedlibmain)dlsym(dlobj,
diff --git a/packages/patches/jack_fixes_0.41.4.patch b/packages/patches/jack_fixes_0.41.4.patch
deleted file mode 100644
index 38661f1b..00000000
--- a/packages/patches/jack_fixes_0.41.4.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Index: s_audio_jack.c
-===================================================================
---- s_audio_jack.c (Revision 12292)
-+++ s_audio_jack.c (Arbeitskopie)
-@@ -13,7 +13,7 @@
-
-
- #define MAX_CLIENTS 100
--#define NUM_JACK_PORTS 32
-+#define NUM_JACK_PORTS 100
- #define BUF_JACK 4096
- static jack_nframes_t jack_out_max;
- #define JACK_OUT_MAX 64
-@@ -100,8 +100,9 @@
- static void
- jack_shutdown (void *arg)
- {
-- /* Ignore for now */
-- // exit (1);
-+ fprintf(stderr, "jack: JACK server shut down\n");
-+ sys_close_audio();
-+ jack_client = NULL;
- }
-
- static int jack_xrun(void* arg) {
-@@ -214,7 +215,7 @@
- }
-
-
--void pd_jack_error_callback(const char *desc) {
-+static void pd_jack_error_callback(const char *desc) {
- return;
- }
-
-@@ -228,7 +229,13 @@
- int client_iterator = 0;
- int new_jack = 0;
- int srate;
-+ jack_status_t status;
-
-+ if(NULL==jack_client_new) {
-+ fprintf(stderr,"JACK framework not available\n");
-+ return 1;
-+ }
-+
- jack_dio_error = 0;
-
- if ((inchans == 0) && (outchans == 0)) return 0;
-@@ -243,13 +250,28 @@
- inchans = NUM_JACK_PORTS;
- }
-
-- /* try to become a client of the JACK server (we allow two pd's)*/
-+ /* try to become a client of the JACK server */
-+ /* if no JACK server exists, start a default one (jack_client_open() does that for us... */
- if (!jack_client) {
- do {
- sprintf(port_name,"pure_data_%d",client_iterator);
- client_iterator++;
-- } while (((jack_client = jack_client_new (port_name)) == 0) && client_iterator < 2);
--
-+
-+ jack_client = jack_client_open (port_name, JackNullOption, &status, NULL);
-+ if (status & JackServerFailed) {
-+ fprintf(stderr,"unable to connect to JACK server\n");
-+ jack_client=NULL;
-+ break;
-+ }
-+ } while (status & JackNameNotUnique);
-+
-+ if(status) {
-+ if (status & JackServerStarted) {
-+ fprintf(stderr, "started JACK server\n");
-+ } else {
-+ fprintf(stderr, "jack returned status %d\n", status);
-+ }
-+ }
-
- if (!jack_client) { // jack spits out enough messages already, do not warn
- sys_inchannels = sys_outchannels = 0;
-@@ -305,11 +327,21 @@
- for (j = 0; j < inchans; j++) {
- sprintf(port_name, "input%d", j);
- if (!input_port[j]) input_port[j] = jack_port_register (jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-+ if (!input_port[j]) {
-+ fprintf (stderr, "jack: can only register %d input ports (instead of requested %d)\n", j, inchans);
-+ sys_inchannels = inchans = j;
-+ break;
-+ }
- }
-
- for (j = 0; j < outchans; j++) {
- sprintf(port_name, "output%d", j);
- if (!output_port[j]) output_port[j] = jack_port_register (jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-+ if (!output_port[j]) {
-+ fprintf (stderr, "jack: can only register %d output ports (instead of requested %d)\n", j, outchans);
-+ sys_outchannels = outchans = j;
-+ break;
-+ }
- }
- outport_count = outchans;
-
diff --git a/packages/patches/object_arg_buffer_overflow_fix-0.41.4.patch b/packages/patches/object_arg_buffer_overflow_fix-0.41.4.patch
deleted file mode 100644
index ddffc49c..00000000
--- a/packages/patches/object_arg_buffer_overflow_fix-0.41.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- m_class.c 2008/02/07 12:55:15 9168
-+++ m_class.c 2008/04/15 23:41:56 9707
-@@ -810,7 +810,7 @@
- va_start(ap, fmt);
- while (1)
- {
-- if (nargs > MAXPDARG)
-+ if (nargs >= MAXPDARG)
- {
- pd_error(x, "pd_vmess: only %d allowed", MAXPDARG);
- break;
diff --git a/packages/patches/s_path_buffer_overflow_fixes-0.41.4.patch b/packages/patches/s_path_buffer_overflow_fixes-0.41.4.patch
deleted file mode 100644
index 19a438b1..00000000
--- a/packages/patches/s_path_buffer_overflow_fixes-0.41.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: s_path.c
-===================================================================
---- s_path.c (revision 9700)
-+++ s_path.c (working copy)
-@@ -380,7 +380,7 @@
- int rcargc;
- char* rcargv[NUMARGS];
- char* buffer;
-- char fname[MAXPDSTRING], buf[1000], *home = getenv("HOME");
-+ char fname[MAXPDSTRING], buf[1001], *home = getenv("HOME");
- int retval = 1; /* that's what we will return at the end; for now, let's think it'll be an error */
-
- /* initialize rc-arg-array so we can safely clean up at the end */
-@@ -424,7 +424,7 @@
- fclose(file);
- if (sys_verbose)
- {
-- if (rcargv)
-+ if (rcargc)
- {
- post("startup args from RC file:");
- for (i = 1; i < rcargc; i++)
diff --git a/packages/patches/spacesymbol-0.42.4.patch b/packages/patches/spacesymbol-0.42.4.patch
deleted file mode 100644
index cbf2d7e4..00000000
--- a/packages/patches/spacesymbol-0.42.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: g_text.c
-===================================================================
---- g_text.c (revision 9678)
-+++ g_text.c (working copy)
-@@ -630,7 +630,6 @@
- gatom_retext(x, 1);
- return;
- }
-- else if (c == ' ') return;
- else if (c == '\b')
- {
- if (len > 0)