[gentoo-commits] gentoo commit in src/patchsets/timidity++/2.13.2: 01_all_exiterror.patch 02_all_gtk26.patch 03_all_gcc4.patch 04_all_flac.patch 05_all_protos.patch 06_all_params.patch 07_all_speex.patch 08_all_Wimplicit-function-declaration.patch series

[Samuli Suominen (ssuominen)]

ssuominen    10/05/03 21:07:28

  Added:                01_all_exiterror.patch 02_all_gtk26.patch
                        03_all_gcc4.patch 04_all_flac.patch
                        05_all_protos.patch 06_all_params.patch
                        07_all_speex.patch
                        08_all_Wimplicit-function-declaration.patch series
  Log:
  Import initial timidity++ patchset, might need a bit cleaning up still

Revision  Changes    Path
1.1                  src/patchsets/timidity++/2.13.2/01_all_exiterror.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/01_all_exiterror.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/01_all_exiterror.patch?rev=1.1&content-type=text/plain

Index: 01_all_exiterror.patch
===================================================================
diff -ur TiMidity++-2.13.2/interface/alsaseq_c.c TiMidity++-2.13.2-new/interface/alsaseq_c.c
--- TiMidity++-2.13.2/interface/alsaseq_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/alsaseq_c.c	2005-01-02 03:39:15.968158520 +0100
@@ -177,7 +177,7 @@
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
-static void ctl_pass_playing_list(int n, char *args[]);
+static int ctl_pass_playing_list(int n, char *args[]);
 
 /**********************************/
 /* export the interface functions */
@@ -308,7 +308,7 @@
         return 0;
 }
 
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 {
 	double btime;
 	int i, j;
@@ -323,7 +323,7 @@
 
 	if (alsa_seq_open(&alsactx.handle) < 0) {
 		fprintf(stderr, "error in snd_seq_open\n");
-		return;
+		return 1;
 	}
 	alsactx.queue = -1;
 	alsactx.client = snd_seq_client_id(alsactx.handle);
@@ -342,7 +342,7 @@
 		int port;
 		port = alsa_create_port(alsactx.handle, i);
 		if (port < 0)
-			return;
+			return 1;
 		alsactx.port[i] = port;
 		alsa_set_timestamping(&alsactx, port);
 		printf(" %d:%d", alsactx.client, alsactx.port[i]);
@@ -411,6 +411,7 @@
 		server_reset();
 		doit(&alsactx);
 	}
+	return 0;
 }
 
 /*
diff -ur TiMidity++-2.13.2/interface/emacs_c.c TiMidity++-2.13.2-new/interface/emacs_c.c
--- TiMidity++-2.13.2/interface/emacs_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/emacs_c.c	2005-01-02 03:02:02.000000000 +0100
@@ -78,7 +78,7 @@
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_event(CtlEvent *e);
 static int read_ready(void);
 static int emacs_type = 0; /* 0:emacs, 1:mule, 2:??
@@ -249,7 +249,7 @@
     return s;
 }
 
-static void ctl_pass_playing_list(int argc, char *argv[])
+static int ctl_pass_playing_list(int argc, char *argv[])
 {
     int i;
     char cmd[BUFSIZ];
@@ -274,7 +274,7 @@
     {
 	for(i = 1; i < argc; i++)
 	    play_midi_file(argv[i]);
-	return;
+	return 0;
     }
 
     /* Main Loop */
@@ -296,11 +296,11 @@
 		ctl_refresh();
 		break;
 	      case RC_QUIT:
-		return;
+		return 0;
 	    } /* skipping others command */
 	}
 	else if(!strncmp(cmd, "QUIT", 4))
-	    return;
+	    return 0;
 	else
 	    continue; /* skipping unknown command */
     }
diff -ur TiMidity++-2.13.2/interface/gtk_c.c TiMidity++-2.13.2-new/interface/gtk_c.c
--- TiMidity++-2.13.2/interface/gtk_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/gtk_c.c	2005-01-02 03:35:53.447946272 +0100
@@ -57,7 +57,7 @@
 
 static int ctl_open(int using_stdin, int using_stdout);
 static void ctl_close(void);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
@@ -528,7 +528,7 @@
 #endif
 }
 
-static void
+static int 
 ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 {
     int i=0;
@@ -558,7 +558,7 @@
 	}
 	else {
 	    if (command==RC_QUIT)
-		return;
+		return 0;
 	    if (command==RC_ERROR)
 		command=RC_TUNE_END; /* Launch next file */
 	    
@@ -580,6 +580,7 @@
 	    command = ctl_blocking_read(&val);
 	}
     }
+    return 0;
 }
 
 /*
diff -ur TiMidity++-2.13.2/interface/mac_c.c TiMidity++-2.13.2-new/interface/mac_c.c
--- TiMidity++-2.13.2/interface/mac_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/mac_c.c	2005-01-02 03:04:13.000000000 +0100
@@ -71,7 +71,7 @@
 static void ctl_pitch_bend(int channel, int val);
 static void ctl_reset(void);
 static int ctl_open(int using_stdin, int using_stdout);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
@@ -955,7 +955,7 @@
 }
 
 
-static void ctl_pass_playing_list(int init_number_of_files,
+static int ctl_pass_playing_list(int init_number_of_files,
 				  char * /*init_list_of_files*/ [])
 {
 	EventRecord	event;
@@ -983,6 +983,7 @@
 		mac_HandleEvent(&event);
 	}	
 	Do_Quit();
+	return 0;
 }
 
 static Boolean UserWantsControl()
diff -ur TiMidity++-2.13.2/interface/motif_c.c TiMidity++-2.13.2-new/interface/motif_c.c
--- TiMidity++-2.13.2/interface/motif_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/motif_c.c	2005-01-02 03:05:04.000000000 +0100
@@ -60,7 +60,7 @@
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_event(CtlEvent *e);
 
 static int motif_ready = 0;
@@ -346,12 +346,13 @@
   return(ctl_blocking_read(valp));
 }
 
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 {
     int i=0;
     char file_to_play[1000];
     int command;
     int32 val;
+    int retval;
 
     motif_ready = 1;
 
@@ -381,12 +382,13 @@
 	    else
 		{
 		    if (command==RC_QUIT)
-			return;
+			return 0;
 
 		    switch(command)
 			{
 			case RC_ERROR:
 			    m_pipe_int_write(ERROR_MESSAGE);
+			    retval=1;
 			    break;
 			case RC_NONE:
 			    break;
@@ -411,6 +413,7 @@
 		    command = ctl_blocking_read(&val);
 		}
 	}
+    return retval;
 }
 
 /*
diff -ur TiMidity++-2.13.2/interface/ncurs_c.c TiMidity++-2.13.2-new/interface/ncurs_c.c
--- TiMidity++-2.13.2/interface/ncurs_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/ncurs_c.c	2005-01-02 03:05:48.000000000 +0100
@@ -174,7 +174,7 @@
 
 static int ctl_open(int using_stdin, int using_stdout);
 static void ctl_close(void);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
@@ -3100,7 +3100,7 @@
     reuse_mblock(&tmpbuffer);
 }
 
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 {
     int i;
     int act_number_of_files;
@@ -3128,7 +3128,7 @@
 
     if (file_list.number<0) {
       cmsg(CMSG_FATAL, VERB_NORMAL, "No MIDI file to play!");
-      return;
+      return 1;
     }
 
     ctl_listmode_max=1;
@@ -3169,7 +3169,7 @@
 		    if(!(ctl.flags & CTLF_LIST_LOOP) || stdin_check)
 		    {
 			aq_flush(0);
-			return;
+			return 0;
 		    }
 		    i = 0;
 		    if(rc == RC_TUNE_END)
@@ -3187,7 +3187,7 @@
 
 		/* else fall through */
 	    case RC_QUIT:
-		return;
+		return 0;
 	    }
 	  ctl_reset();
 	}
diff -ur TiMidity++-2.13.2/interface/portmidisyn_c.c TiMidity++-2.13.2-new/interface/portmidisyn_c.c
--- TiMidity++-2.13.2/interface/portmidisyn_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/portmidisyn_c.c	2005-01-02 03:13:05.000000000 +0100
@@ -96,7 +96,7 @@
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
-static void ctl_pass_playing_list(int n, char *args[]);
+static int ctl_pass_playing_list(int n, char *args[]);
 
 #ifndef __W32__
 static void init_keybord(void);
@@ -215,17 +215,17 @@
 
 #ifdef IA_W32G_SYN
 extern void w32g_syn_doit(void);
-extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
 
 
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 {
-	w32g_syn_ctl_pass_playing_list ( n, args );
+	return w32g_syn_ctl_pass_playing_list ( n, args );
 }
 #endif
 
 #ifndef IA_W32G_SYN
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 #else
 // 0: OK, 2: Require to reset.
 int ctl_pass_playing_list2(int n, char *args[])
@@ -241,7 +241,7 @@
 #ifndef IA_W32G_SYN
 	if(n > MAX_PORT ){
 		printf( "Usage: timidity -iW [Midi interface No s]\n");
-		return;
+		return 1;
 	}
 #endif
 
@@ -347,11 +347,7 @@
 #endif /* USE_GTK_GUI */
 	rtsyn_close();
 
-#ifdef IA_W32G_SYN
 	return 0;
-#else
-	return;
-#endif
 }
 
 
diff -ur TiMidity++-2.13.2/interface/server_c.c TiMidity++-2.13.2-new/interface/server_c.c
--- TiMidity++-2.13.2/interface/server_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/server_c.c	2005-01-02 03:07:38.000000000 +0100
@@ -176,7 +176,7 @@
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
-static void ctl_pass_playing_list(int n, char *args[]);
+static int ctl_pass_playing_list(int n, char *args[]);
 
 /**********************************/
 /* export the interface functions */
@@ -356,14 +356,14 @@
 static void compute_sample_increment(void);
 static void server_reset(void);
 
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 {
     int sock;
 
     if(n != 2 && n != 1)
     {
 	fprintf(stderr, "Usage: timidity -ir control-port [data-port]\n");
-	return;
+	return 1;
     }
 
 #ifdef SIGPIPE
@@ -379,7 +379,7 @@
     if (control_port) {
 	sock = pasv_open(&control_port);
 	if(sock == -1)
-	    return;
+	    return 1;
     }
     opt_realtime_playing = 1; /* Enable loading patch while playing */
     allocate_cache_size = 0; /* Don't use pre-calclated samples */
@@ -404,7 +404,7 @@
 		    continue;
 		perror("accept");
 		close(sock);
-		return;
+		return 1;
 	    }
 	}
 	else control_fd = 0;
@@ -446,6 +446,7 @@
 	if (!control_port)
 	    break;
     }
+    return 0;
 }
 
 #define MAX_GETCMD_PARAMS 8
diff -ur TiMidity++-2.13.2/interface/tk_c.c TiMidity++-2.13.2-new/interface/tk_c.c
--- TiMidity++-2.13.2/interface/tk_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/tk_c.c	2005-01-02 03:08:48.000000000 +0100
@@ -86,7 +86,7 @@
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static int ctl_blocking_read(int32 *valp);
 static void ctl_note(int status, int ch, int note, int vel);
 static void ctl_event(CtlEvent *e);
@@ -587,7 +587,7 @@
 	return(ctl_blocking_read(valp));
 }
 
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 {
 	int i=0;
 	char local[1000];
@@ -618,7 +618,7 @@
 				/* if really QUIT */
 				k_pipe_gets(local, sizeof(local)-1);
 				if (*local == 'Z')
-					return;
+					return 0;
 				/* only stop playing..*/
 			}
 			if (command==RC_CHANGE_VOLUME) /* init volume */
@@ -646,6 +646,7 @@
 			command = ctl_blocking_read(&val);
 		}
 	}
+	return 0;
 }
 
 
diff -ur TiMidity++-2.13.2/interface/w32g_c.c TiMidity++-2.13.2-new/interface/w32g_c.c
--- TiMidity++-2.13.2/interface/w32g_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/w32g_c.c	2005-01-02 03:10:03.000000000 +0100
@@ -86,7 +86,7 @@
 
 static int ctl_open(int using_stdin, int using_stdout);
 static void ctl_close(void);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_event(CtlEvent *e);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
@@ -662,7 +662,7 @@
 }
 
 extern BOOL SetWrdWndActive(void);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
 {
 	static int init_flag = 1;
     int rc;
@@ -779,7 +779,7 @@
 		if(ctl.flags & CTLF_AUTOEXIT) {
 		    if(play_mode->fd != -1)
 			aq_flush(0);
-		    return;
+		    return 0;
 		}
 		break;
 	    }
@@ -803,7 +803,7 @@
 		if(ctl.flags & CTLF_AUTOEXIT){
 		    if(play_mode->fd != -1)
 			aq_flush(0);
-		    return;
+		    return 0;
 		}
 		if((ctl.flags & CTLF_LIST_LOOP) && w32g_nvalid_playlist())
 		{
@@ -839,7 +839,7 @@
 	  case RC_QUIT:
 	    if(play_mode->fd != -1)
 		aq_flush(1);
-	    return;
+	    return 0;
 
 	  case RC_CHANGE_VOLUME:
 	    amplification += value;
@@ -868,6 +868,7 @@
 	    PrefSettingApplyReally();
 	rc = RC_NONE;
     }
+	return 0;
 }
 
 static void ctl_lcd_mark(int flag, int x, int y)
diff -ur TiMidity++-2.13.2/interface/w32g_syn.c TiMidity++-2.13.2-new/interface/w32g_syn.c
--- TiMidity++-2.13.2/interface/w32g_syn.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/w32g_syn.c	2005-01-02 03:10:49.000000000 +0100
@@ -281,7 +281,7 @@
 static int wait_for_termination_of_syn_thread ( void );
 int w32g_message_set ( int cmd );
 int w32g_message_get ( w32g_syn_message_t *msg );
-void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
 int w32g_syn_do_before_pref_apply ( void );
 int w32g_syn_do_after_pref_apply ( void );
 
@@ -1403,7 +1403,7 @@
 	}
 }
 
-void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
 {
 	int i;
 #ifndef TWSYNSRV
@@ -1471,6 +1471,7 @@
 	}
 #endif
 	if ( w32g_syn.quit_state < 2 ) w32g_syn.quit_state = 2;
+	return 0;
 }
 
 int w32g_syn_do_before_pref_apply ( void )
diff -ur TiMidity++-2.13.2/interface/winsyn_c.c TiMidity++-2.13.2-new/interface/winsyn_c.c
--- TiMidity++-2.13.2/interface/winsyn_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/winsyn_c.c	2005-01-02 03:11:36.000000000 +0100
@@ -88,7 +88,7 @@
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
 static void ctl_event(CtlEvent *e);
-static void ctl_pass_playing_list(int n, char *args[]);
+static int ctl_pass_playing_list(int n, char *args[]);
 
 #ifndef __W32__
 static void init_keybord(void);
@@ -207,17 +207,17 @@
 
 #ifdef IA_W32G_SYN
 extern void w32g_syn_doit(void);
-extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
 
 
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 {
-	w32g_syn_ctl_pass_playing_list ( n, args );
+	return w32g_syn_ctl_pass_playing_list ( n, args );
 }
 #endif
 
 #ifndef IA_W32G_SYN
-static void ctl_pass_playing_list(int n, char *args[])
+static int ctl_pass_playing_list(int n, char *args[])
 #else
 // 0: OK, 2: Require to reset.
 int ctl_pass_playing_list2(int n, char *args[])
@@ -233,7 +233,7 @@
 #ifndef IA_W32G_SYN
 	if(n > MAX_PORT ){
 		printf( "Usage: timidity -iW [Midi interface No s]\n");
-		return;
+		return 1;
 	}
 #endif
 
@@ -339,11 +339,7 @@
 #endif /* USE_GTK_GUI */
 	rtsyn_close();
 
-#ifdef IA_W32G_SYN
 	return 0;
-#else
-	return;
-#endif
 }
 
 
diff -ur TiMidity++-2.13.2/interface/xaw_c.c TiMidity++-2.13.2-new/interface/xaw_c.c
--- TiMidity++-2.13.2/interface/xaw_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/xaw_c.c	2005-01-02 03:11:57.000000000 +0100
@@ -55,7 +55,7 @@
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_event(CtlEvent *e);
 
 static void a_pipe_open(void);
@@ -463,7 +463,7 @@
   }
 }
 
-static void ctl_pass_playing_list(int init_number_of_files,
+static int ctl_pass_playing_list(int init_number_of_files,
                   char *init_list_of_files[]) {
   int current_no,command=RC_NONE,i,j;
   int32 val;
diff -ur TiMidity++-2.13.2/interface/xskin_c.c TiMidity++-2.13.2-new/interface/xskin_c.c
--- TiMidity++-2.13.2/interface/xskin_c.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/interface/xskin_c.c	2005-01-02 03:12:31.000000000 +0100
@@ -55,7 +55,7 @@
 static void ctl_close(void);
 static int ctl_read(int32 *valp);
 static int cmsg(int type, int verbosity_level, char *fmt, ...);
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
 static void ctl_event(CtlEvent *e);
 static void ctl_speana_data(double *val, int size);
 static void initialize_exp_hz_table( void );
@@ -342,7 +342,7 @@
   }
 }
 
-static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
 
   int current_no,command,i;
   int32 val;
@@ -403,7 +403,7 @@
       command=play_midi_file(list_of_files[file_table[current_no]]);
     } else {
       /* Quit timidity*/
-      if (exitflag) return;
+      if (exitflag) return 0;
       /* Stop playing */
       if (command==RC_QUIT) {
 	sprintf(local_buf,"T 00:00");
@@ -461,6 +461,7 @@
       command=ctl_blocking_read(&val);
     }
   }
+  return 0;
 }
 
 /* ------ Pipe handlers ----- */
diff -ur TiMidity++-2.13.2/timidity/controls.h TiMidity++-2.13.2-new/timidity/controls.h
--- TiMidity++-2.13.2/timidity/controls.h	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/timidity/controls.h	2005-01-02 02:59:37.000000000 +0100
@@ -147,7 +147,7 @@
 
   int  (*open)(int using_stdin, int using_stdout);
   void (*close)(void);
-  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
+  int (*pass_playing_list)(int number_of_files, char *list_of_files[]);
   int  (*read)(int32 *valp);
   int  (*cmsg)(int type, int verbosity_level, char *fmt, ...);
   void (*event)(CtlEvent *ev);	/* Control events */
diff -ur TiMidity++-2.13.2/timidity/playmidi.c TiMidity++-2.13.2-new/timidity/playmidi.c
--- TiMidity++-2.13.2/timidity/playmidi.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/timidity/playmidi.c	2005-01-02 03:15:55.000000000 +0100
@@ -8562,7 +8562,7 @@
     return rc;
 }
 
-void dumb_pass_playing_list(int number_of_files, char *list_of_files[])
+int dumb_pass_playing_list(int number_of_files, char *list_of_files[])
 {
     #ifndef CFG_FOR_SF
     int i = 0;
@@ -8586,12 +8586,12 @@
 	    aq_flush(0);
 
 	    if(!(ctl->flags & CTLF_LIST_LOOP))
-		return;
+		return 0;
 	    i = 0;
 	    break;
 
 	    case RC_QUIT:
-		return;
+		return 0;
 	}
     }
     #endif
diff -ur TiMidity++-2.13.2/timidity/playmidi.h TiMidity++-2.13.2-new/timidity/playmidi.h
--- TiMidity++-2.13.2/timidity/playmidi.h	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/timidity/playmidi.h	2005-01-02 03:16:07.000000000 +0100
@@ -577,7 +577,7 @@
 extern int opt_pan_delay;
 
 extern int play_midi_file(char *fn);
-extern void dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
+extern int dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
 extern void default_ctl_lyric(int lyricid);
 extern int check_apply_control(void);
 extern void recompute_freq(int v);
diff -ur TiMidity++-2.13.2/timidity/sndfont.c TiMidity++-2.13.2-new/timidity/sndfont.c
--- TiMidity++-2.13.2/timidity/sndfont.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/timidity/sndfont.c	2005-01-02 03:15:27.000000000 +0100
@@ -1893,7 +1893,7 @@
 
 #if CFG_FOR_SF_SUPPORT_FFT
 int check_apply_control(void) { return 0; } // not pass
-void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {}
+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {return 0;}
 void recompute_freq(int v) {} // not pass
 int32 control_ratio = 0;
 int reduce_quality_flag = 0;
diff -ur TiMidity++-2.13.2/timidity/timidity.c TiMidity++-2.13.2-new/timidity/timidity.c
--- TiMidity++-2.13.2/timidity/timidity.c	2005-01-02 02:53:01.000000000 +0100
+++ TiMidity++-2.13.2-new/timidity/timidity.c	2005-01-02 02:59:29.000000000 +0100
@@ -5291,6 +5291,7 @@
     int need_stdin = 0, need_stdout = 0;
     int i;
     int output_fail = 0;
+    int retval;
 
     if(nfiles == 0 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character))
 	return 0;
@@ -5410,7 +5411,7 @@
 	ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY,
 		  "pass_playing_list() nfiles=%d", nfiles);
 
-	ctl->pass_playing_list(nfiles, files);
+	retval=ctl->pass_playing_list(nfiles, files);
 
 	if(intr)
 	    aq_flush(1);
@@ -5451,7 +5452,7 @@
     url_news_connection_cache(URL_NEWS_CLOSE_CACHE);
 #endif /* SUPPORT_SOCKET */
 
-    return 0;
+    return retval;
 }
 
 #ifdef IA_W32GUI



1.1                  src/patchsets/timidity++/2.13.2/02_all_gtk26.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/02_all_gtk26.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/02_all_gtk26.patch?rev=1.1&content-type=text/plain

Index: 02_all_gtk26.patch
===================================================================
--- interface/gtk_i.c	2004/12/21 16:59:33	1.1
+++ interface/gtk_i.c	2004/12/21 16:59:41
@@ -365,6 +365,7 @@ void
 Launch_Gtk_Process(int pipe_number)
 {
     int	argc = 0;
+    gchar **argv = NULL;
     GtkWidget *button, *mbar, *swin;
     GtkWidget *table, *align, *handlebox;
     GtkWidget *vbox, *hbox, *vbox2, *scrolled_win;
@@ -373,7 +374,7 @@ Launch_Gtk_Process(int pipe_number)
     /* enable locale */
     gtk_set_locale ();
 
-    gtk_init (&argc, NULL);
+    gtk_init (&argc, &argv);
 
     ttip = create_yellow_tooltips();
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);



1.1                  src/patchsets/timidity++/2.13.2/03_all_gcc4.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/03_all_gcc4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/03_all_gcc4.patch?rev=1.1&content-type=text/plain

Index: 03_all_gcc4.patch
===================================================================
diff -ur TiMidity++-2.13.2-orig/interface/xaw_i.c TiMidity++-2.13.2/interface/xaw_i.c
--- TiMidity++-2.13.2-orig/interface/xaw_i.c	2005-06-25 21:55:19.000000000 -0400
+++ TiMidity++-2.13.2/interface/xaw_i.c	2005-06-25 21:56:01.000000000 -0400
@@ -261,7 +261,7 @@
 String bitmapdir = XAW_BITMAP_DIR;
 Boolean arrangetitle,savelist;
 static char **current_flist = NULL;
-static int voices = 0, last_voice = 0, voices_num_width;
+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
 static int maxentry_on_a_menu = 0,submenu_n = 0;
 #define OPTIONS_WINDOW 1
 #define FLIST_WINDOW 2
@@ -1329,7 +1329,7 @@
     c= *(local_buf+1);
     n= atoi(local_buf+2);
     if(c == 'L')
-      voices = n;
+      xaw_i_voices = n;
     else
       last_voice = n;
     if(IsTracePlaying()) drawVoices();
@@ -2070,7 +2070,7 @@
   XSetForeground(disp, gct, tracecolor);
   XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
-  sprintf(local_buf, "%3d/%d", last_voice, voices);
+  sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
   XSetForeground(disp, gct, capcolor);  
   XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));



1.1                  src/patchsets/timidity++/2.13.2/04_all_flac.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/04_all_flac.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/04_all_flac.patch?rev=1.1&content-type=text/plain

Index: 04_all_flac.patch
===================================================================
diff -ur TiMidity++-2.13.2.orig/timidity/flac_a.c TiMidity++-2.13.2/timidity/flac_a.c
--- TiMidity++-2.13.2.orig/timidity/flac_a.c	2004-05-23 07:35:44.000000000 +0300
+++ TiMidity++-2.13.2/timidity/flac_a.c	2010-05-03 23:45:26.000000000 +0300
@@ -45,6 +45,11 @@
 #endif
 
 #include <FLAC/all.h>
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
 #ifdef AU_OGGFLAC
 #include <OggFLAC/stream_encoder.h>
 #endif
@@ -100,7 +105,11 @@
   unsigned long out_bytes;
   union {
     FLAC__StreamEncoderState flac;
+#ifdef LEGACY_FLAC
     FLAC__SeekableStreamEncoderState s_flac;
+#else
+    FLAC__StreamEncoderState s_flac;
+#endif
 #ifdef AU_OGGFLAC
     OggFLAC__StreamEncoderState ogg;
 #endif
@@ -108,7 +117,11 @@
   union {
     union {
       FLAC__StreamEncoder *stream;
+#ifdef LEGACY_FLAC
       FLAC__SeekableStreamEncoder *s_stream;
+#else
+      FLAC__StreamEncoder *s_stream;
+#endif
     } flac;
 #ifdef AU_OGGFLAC
     union {
@@ -174,11 +187,19 @@
 						  const FLAC__StreamMetadata *metadata,
 						  void *client_data);
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder,
+#else
+flac_seekable_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
+#endif
 				   const FLAC__byte buffer[],
 				   unsigned bytes, unsigned samples,
 				   unsigned current_frame, void *client_data);
+#ifdef LEGACY_FLAC
 static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
+#else
+static void flac_seekable_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
+#endif
 						  const FLAC__StreamMetadata *metadata,
 						  void *client_data);
 
@@ -306,8 +327,13 @@
 #endif /* AU_OGGFLAC */
     if (flac_options.seekable) {
       if (ctx->encoder.flac.s_stream) {
+#ifdef LEGACY_FLAC
 	FLAC__seekable_stream_encoder_finish(ctx->encoder.flac.s_stream);
 	FLAC__seekable_stream_encoder_delete(ctx->encoder.flac.s_stream);
+#else
+	FLAC__stream_encoder_finish(ctx->encoder.flac.s_stream);
+	FLAC__stream_encoder_delete(ctx->encoder.flac.s_stream);
+#endif
       }
     }
     else
@@ -435,17 +461,29 @@
   else
 #endif /* AU_OGGFLAC */
   if (flac_options.seekable) {
+#ifdef LEGACY_FLAC
     if ((ctx->encoder.flac.s_stream = FLAC__seekable_stream_encoder_new()) == NULL) {
+#else
+    if ((ctx->encoder.flac.s_stream = FLAC__stream_encoder_new()) == NULL) {
+#endif
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC stream");
       flac_session_close();
       return -1;
     }
 
+#ifdef LEGACY_FLAC
     FLAC__seekable_stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch);
     /* 16bps only */
     FLAC__seekable_stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16);
 
     FLAC__seekable_stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify);
+#else
+    FLAC__stream_encoder_set_channels(ctx->encoder.flac.s_stream, nch);
+    /* 16bps only */
+    FLAC__stream_encoder_set_bits_per_sample(ctx->encoder.flac.s_stream, 16);
+
+    FLAC__stream_encoder_set_verify(ctx->encoder.flac.s_stream, flac_options.verify);
+#endif
 
     if (!FLAC__format_sample_rate_is_valid(dpm.rate)) {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "invalid sampling rate %d",
@@ -453,27 +491,54 @@
       flac_session_close();
       return -1;
     }
+#ifdef LEGACY_FLAC
     FLAC__seekable_stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate);
 
     FLAC__seekable_stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision);
     /* expensive! */
     FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search);
+#else
+    FLAC__stream_encoder_set_sample_rate(ctx->encoder.flac.s_stream, dpm.rate);
+
+    FLAC__stream_encoder_set_qlp_coeff_precision(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision);
+    /* expensive! */
+    FLAC__stream_encoder_set_do_qlp_coeff_prec_search(ctx->encoder.flac.s_stream, flac_options.qlp_coeff_precision_search);
+#endif
+
 
     if (nch == 2) {
+#ifdef LEGACY_FLAC
       FLAC__seekable_stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side);
       FLAC__seekable_stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side);
+#else
+      FLAC__stream_encoder_set_do_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.mid_side);
+      FLAC__stream_encoder_set_loose_mid_side_stereo(ctx->encoder.flac.s_stream, flac_options.adaptive_mid_side);
+#endif
     }
 
+#ifdef LEGACY_FLAC
     FLAC__seekable_stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order);
     FLAC__seekable_stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order);
     FLAC__seekable_stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order);
 
     FLAC__seekable_stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize);
     FLAC__seekable_stream_encoder_set_client_data(ctx->encoder.flac.s_stream, ctx);
+#else
+    FLAC__stream_encoder_set_max_lpc_order(ctx->encoder.flac.s_stream, flac_options.max_lpc_order);
+    FLAC__stream_encoder_set_min_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.min_residual_partition_order);
+    FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.s_stream, flac_options.max_residual_partition_order);
+
+    FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.s_stream, flac_options.blocksize);
+#endif
 
     if (0 < num_metadata)
+#ifdef LEGACY_FLAC
       FLAC__seekable_stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata);
+#else
+      FLAC__stream_encoder_set_metadata(ctx->encoder.flac.s_stream, metadata, num_metadata);
+#endif
 
+#ifdef LEGACY_FLAC
     /* set callback */
 /*    FLAC__seekable_stream_encoder_set_metadata_callback(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_metadata_callback); /* */
 #ifndef __BORLANDC__
@@ -483,8 +548,17 @@
 
     ctx->state.s_flac = FLAC__seekable_stream_encoder_init(ctx->encoder.flac.s_stream);
     if (ctx->state.s_flac != FLAC__SEEKABLE_STREAM_ENCODER_OK) {
+#else
+
+    ctx->state.s_flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.s_stream, flac_seekable_stream_encoder_write_callback, NULL, NULL, flac_seekable_stream_encoder_metadata_callback,  ctx);
+    if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) {
+#endif
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)",
+#ifdef LEGACY_FLAC
 		FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
+#else
+		FLAC__StreamEncoderStateString[ctx->state.s_flac]);
+#endif
       flac_session_close();
       return -1;
     }
@@ -525,16 +599,22 @@
     FLAC__stream_encoder_set_max_residual_partition_order(ctx->encoder.flac.stream, flac_options.max_residual_partition_order);
 
     FLAC__stream_encoder_set_blocksize(ctx->encoder.flac.stream, flac_options.blocksize);
+#ifdef LEGACY_FLAC
     FLAC__stream_encoder_set_client_data(ctx->encoder.flac.stream, ctx);
+#endif
 
     if (0 < num_metadata)
       FLAC__stream_encoder_set_metadata(ctx->encoder.flac.stream, metadata, num_metadata);
 
+#ifdef LEGACY_FLAC
     /* set callback */
     FLAC__stream_encoder_set_metadata_callback(ctx->encoder.flac.stream, flac_stream_encoder_metadata_callback);
     FLAC__stream_encoder_set_write_callback(ctx->encoder.flac.stream, flac_stream_encoder_write_callback);
 
     ctx->state.flac = FLAC__stream_encoder_init(ctx->encoder.flac.stream);
+#else
+    ctx->state.flac = FLAC__stream_encoder_init_stream(ctx->encoder.flac.stream, flac_stream_encoder_write_callback, NULL, NULL,  flac_stream_encoder_metadata_callback, ctx);
+#endif
     if (ctx->state.flac != FLAC__STREAM_ENCODER_OK) {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot create FLAC state (%s)",
 		FLAC__StreamEncoderStateString[ctx->state.flac]);
@@ -676,7 +756,11 @@
 {
 }
 static FLAC__StreamEncoderWriteStatus
+#ifdef LEGACY_FLAC
 flac_seekable_stream_encoder_write_callback(const FLAC__SeekableStreamEncoder *encoder,
+#else
+flac_seekable_stream_encoder_write_callback(const FLAC__StreamEncoder *encoder,
+#endif
 				   const FLAC__byte buffer[],
 				   unsigned bytes, unsigned samples,
 				   unsigned current_frame, void *client_data)
@@ -690,7 +774,11 @@
   else
     return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 }
+#ifdef LEGACY_FLAC
 static void flac_seekable_stream_encoder_metadata_callback(const FLAC__SeekableStreamEncoder *encoder,
+#else
+static void flac_seekable_stream_encoder_metadata_callback(const FLAC__StreamEncoder *encoder,
+#endif
 						  const FLAC__StreamMetadata *metadata,
 						  void *client_data)
 {
@@ -747,22 +835,38 @@
   else
 #endif /* AU_OGGFLAC */
 	if (flac_options.seekable) {
+#ifdef LEGACY_FLAC
     ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream);
+#else
+    ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream);
+#endif
     if (ctx->state.s_flac != FLAC__STREAM_ENCODER_OK) {
       if (ctx->state.s_flac == FLAC__STREAM_ENCODER_VERIFY_DECODER_ERROR |
 	  FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) {
 	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream verify error (%s)",
+#ifdef LEGACY_FLAC
 		  FLAC__SeekableStreamDecoderStateString[FLAC__seekable_stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]);
+#else
+		  FLAC__StreamDecoderStateString[FLAC__stream_encoder_get_verify_decoder_state(ctx->encoder.flac.s_stream)]);
+#endif
       }
       else {
 	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream (%s)",
+#ifdef LEGACY_FLAC
 		  FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
+#else
+		  FLAC__StreamEncoderStateString[ctx->state.s_flac]);
+#endif
       }
       flac_session_close();
       return -1;
     }
 
+#ifdef LEGACY_FLAC
     if (!FLAC__seekable_stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf,
+#else
+    if (!FLAC__stream_encoder_process_interleaved(ctx->encoder.flac.s_stream, oggbuf,
+#endif
 						  nbytes / nch / 2 )) {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "cannot encode FLAC stream");
       flac_session_close();
@@ -812,9 +916,8 @@
     flac_session_close();
     return;
   }
-
-  if (flac_options.isogg) {
 #ifdef AU_OGGFLAC
+  if (flac_options.isogg) {
     if ((ctx->state.ogg = OggFLAC__stream_encoder_get_state(ctx->encoder.ogg.stream)) != OggFLAC__STREAM_ENCODER_OK) {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "OggFLAC stream encoder is invalid (%s)",
 		OggFLAC__StreamEncoderStateString[ctx->state.ogg]);
@@ -824,9 +927,17 @@
   else
 #endif /* AU_OGGFLAC */
   if (flac_options.seekable) {
+#ifdef LEGACY_FLAC
     if ((ctx->state.s_flac = FLAC__seekable_stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__SEEKABLE_STREAM_ENCODER_OK) {
+#else
+    if ((ctx->state.s_flac = FLAC__stream_encoder_get_state(ctx->encoder.flac.s_stream)) != FLAC__STREAM_ENCODER_OK) {
+#endif
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "FLAC stream encoder is invalid (%s)",
+#ifdef LEGACY_FLAC
 		FLAC__SeekableStreamEncoderStateString[ctx->state.s_flac]);
+#else
+		FLAC__StreamEncoderStateString[ctx->state.s_flac]);
+#endif
       /* fall through */
     }
 	}



1.1                  src/patchsets/timidity++/2.13.2/05_all_protos.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/05_all_protos.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/05_all_protos.patch?rev=1.1&content-type=text/plain

Index: 05_all_protos.patch
===================================================================
--- TiMidity++-2.13.2/timidity/flac_a.c
+++ TiMidity++-2.13.2/timidity/flac_a.c
@@ -61,6 +61,7 @@
 #include "w32_libOGGFLAC_dll_g.h"
 #endif
 
+#include "common.h"
 #include "timidity.h"
 #include "output.h"
 #include "controls.h"



1.1                  src/patchsets/timidity++/2.13.2/06_all_params.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/06_all_params.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/06_all_params.patch?rev=1.1&content-type=text/plain

Index: 06_all_params.patch
===================================================================
diff -ur TiMidity++-2.13.2.orig/autoconf/arts.m4 TiMidity++-2.13.2/autoconf/arts.m4
--- TiMidity++-2.13.2.orig/autoconf/arts.m4	2002-10-05 06:16:37.000000000 +0300
+++ TiMidity++-2.13.2/autoconf/arts.m4	2009-07-24 11:35:57.000000000 +0300
@@ -9,7 +9,7 @@
 dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl Test for aRts, and define ARTS_CFLAGS and ARTS_LIBS
 dnl
-AC_DEFUN(AM_PATH_ARTS,
+AC_DEFUN([AM_PATH_ARTS],
 	[dnl 
 dnl Get the cflags and libraries from the arts-config script
 dnl
@@ -156,4 +156,4 @@
   AC_SUBST(ARTS_LIBS)
   rm -f conf.artstest
 ])
-dnl End of aRts
\ No newline at end of file
+dnl End of aRts
diff -ur TiMidity++-2.13.2.orig/autoconf/vorbis.m4 TiMidity++-2.13.2/autoconf/vorbis.m4
--- TiMidity++-2.13.2.orig/autoconf/vorbis.m4	2002-07-06 17:38:06.000000000 +0300
+++ TiMidity++-2.13.2/autoconf/vorbis.m4	2009-07-24 11:32:13.000000000 +0300
@@ -5,7 +5,7 @@
 dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
 dnl
-AC_DEFUN(AM_PATH_VORBIS,
+AC_DEFUN([AM_PATH_VORBIS],
 [dnl 
 dnl Get the cflags and libraries
 dnl
diff -ur TiMidity++-2.13.2.orig/configure.in TiMidity++-2.13.2/configure.in
--- TiMidity++-2.13.2.orig/configure.in	2004-10-03 15:39:52.000000000 +0300
+++ TiMidity++-2.13.2/configure.in	2009-07-24 12:26:04.000000000 +0300
@@ -1925,10 +1925,10 @@
 
 AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
 
-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
+LDFLAGS="$LDFLAGS"
+SHLDFLAGS="$SHLDFLAGS"
+CFLAGS="$EXTRACFLAGS $CFLAGS"
+CPPFLAGS="$CPPFLAGS $EXTRADEFS"
 
 if test "x$oss_device" != x; then
   AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)



1.1                  src/patchsets/timidity++/2.13.2/07_all_speex.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/07_all_speex.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/07_all_speex.patch?rev=1.1&content-type=text/plain

Index: 07_all_speex.patch
===================================================================
diff -ur TiMidity++-2.13.2.orig/timidity/speex_a.c TiMidity++-2.13.2/timidity/speex_a.c
--- TiMidity++-2.13.2.orig/timidity/speex_a.c	2004-04-23 11:18:04.000000000 +0300
+++ TiMidity++-2.13.2/timidity/speex_a.c	2010-05-03 23:47:50.000000000 +0300
@@ -33,8 +33,8 @@
 #include <fcntl.h>
 #endif
 
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
 #include <ogg/ogg.h>
 
 #include "timidity.h"



1.1                  src/patchsets/timidity++/2.13.2/08_all_Wimplicit-function-declaration.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/08_all_Wimplicit-function-declaration.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/08_all_Wimplicit-function-declaration.patch?rev=1.1&content-type=text/plain

Index: 08_all_Wimplicit-function-declaration.patch
===================================================================
http://bugs.gentoo.org/show_bug.cgi?id=309713

diff -ur TiMidity++-2.13.2.orig/timidity/effect.c TiMidity++-2.13.2/timidity/effect.c
--- TiMidity++-2.13.2.orig/timidity/effect.c	2004-03-25 07:51:51.000000000 +0200
+++ TiMidity++-2.13.2/timidity/effect.c	2010-05-03 23:52:47.000000000 +0300
@@ -29,6 +29,10 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif /* HAVE_STDLIB_H */
+
 #ifndef NO_STRING_H
 #include <string.h>
 #else
diff -ur TiMidity++-2.13.2.orig/timidity/sndfont.c TiMidity++-2.13.2/timidity/sndfont.c
--- TiMidity++-2.13.2.orig/timidity/sndfont.c	2010-05-03 23:48:44.000000000 +0300
+++ TiMidity++-2.13.2/timidity/sndfont.c	2010-05-03 23:51:09.000000000 +0300
@@ -55,6 +55,7 @@
 #include "output.h"
 #include "filter.h"
 #include "resample.h"
+#include "freq.h"
 
 #define FILENAME_NORMALIZE(fname) url_expand_home_dir(fname)
 #define FILENAME_REDUCED(fname)   url_unexpand_home_dir(fname)
diff -ur TiMidity++-2.13.2.orig/timidity/speex_a.c TiMidity++-2.13.2/timidity/speex_a.c
--- TiMidity++-2.13.2.orig/timidity/speex_a.c	2010-05-03 23:49:28.000000000 +0300
+++ TiMidity++-2.13.2/timidity/speex_a.c	2010-05-03 23:53:29.000000000 +0300
@@ -45,6 +45,7 @@
 #include "playmidi.h"
 #include "readmidi.h"
 #include "miditrace.h"
+#include "common.h"
 
 static int open_output(void); /* 0=success, 1=warning, -1=fatal error */
 static void close_output(void);



1.1                  src/patchsets/timidity++/2.13.2/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/timidity++/2.13.2/series?rev=1.1&content-type=text/plain

Index: series
===================================================================
01_all_exiterror.patch
02_all_gtk26.patch
03_all_gcc4.patch
04_all_flac.patch
05_all_protos.patch
06_all_params.patch
07_all_speex.patch
08_all_Wimplicit-function-declaration.patch