rpms/timidity++/devel TiMidity++-2.13.2-missing-protos.patch, NONE, 1.1 timidity++.spec, 1.28, 1.29

Thu Apr 3 14:29:49 UTC 2008

Author: jwrdegoede

Update of /cvs/extras/rpms/timidity++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv973

Modified Files:
	timidity++.spec 
Added Files:
	TiMidity++-2.13.2-missing-protos.patch 
Log Message:
* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-15
- Fix missing prototype compiler warnings


TiMidity++-2.13.2-missing-protos.patch:

--- NEW FILE TiMidity++-2.13.2-missing-protos.patch ---
diff -up TiMidity++-2.13.2/configure~ TiMidity++-2.13.2/configure
--- TiMidity++-2.13.2/configure~	2008-04-03 15:54:20.000000000 +0200
+++ TiMidity++-2.13.2/configure	2008-04-03 15:54:20.000000000 +0200
@@ -6983,8 +6983,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
@@ -9583,8 +9583,8 @@ else
       int main ()
       {
 	if (fork() < 0)
-	  exit (1);
-	exit (0);
+	  return (1);
+	return (0);
       }
 _ACEOF
 rm -f conftest$ac_exeext
diff -up TiMidity++-2.13.2/timidity/speex_a.c~ TiMidity++-2.13.2/timidity/speex_a.c
--- TiMidity++-2.13.2/timidity/speex_a.c~	2008-04-03 16:07:23.000000000 +0200
+++ TiMidity++-2.13.2/timidity/speex_a.c	2008-04-03 16:08:14.000000000 +0200
@@ -26,6 +26,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -35,6 +37,7 @@
 
 #include <speex/speex.h>
 #include <speex/speex_header.h>
+#include <speex/speex_stereo.h>
 #include <ogg/ogg.h>
 
 #include "timidity.h"
@@ -45,6 +48,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);
diff -up TiMidity++-2.13.2/timidity/esd_a.c~ TiMidity++-2.13.2/timidity/esd_a.c
--- TiMidity++-2.13.2/timidity/esd_a.c~	2008-04-03 16:05:37.000000000 +0200
+++ TiMidity++-2.13.2/timidity/esd_a.c	2008-04-03 16:05:37.000000000 +0200
@@ -28,6 +28,7 @@
 #endif /* HAVE_CONFIG_H */
 #define _GNU_SOURCE
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <dlfcn.h>
diff -up TiMidity++-2.13.2/timidity/oss_a.c~ TiMidity++-2.13.2/timidity/oss_a.c
--- TiMidity++-2.13.2/timidity/oss_a.c~	2008-04-03 16:03:36.000000000 +0200
+++ TiMidity++-2.13.2/timidity/oss_a.c	2008-04-03 16:03:36.000000000 +0200
@@ -39,6 +39,7 @@
 
 #if defined(HAVE_SYS_SOUNDCARD_H)
 #include <sys/soundcard.h>
+#include <sys/ioctl.h>
 #elif defined(linux)
 #include <sys/ioctl.h> /* new with 1.2.0? Didn't need this under 1.1.64 */
 #include <linux/soundcard.h>
diff -up TiMidity++-2.13.2/timidity/flac_a.c~ TiMidity++-2.13.2/timidity/flac_a.c
--- TiMidity++-2.13.2/timidity/flac_a.c~	2008-04-03 16:06:00.000000000 +0200
+++ TiMidity++-2.13.2/timidity/flac_a.c	2008-04-03 16:06:36.000000000 +0200
@@ -30,10 +30,10 @@
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <fcntl.h>
+#include <time.h>
 
 #ifdef __W32__
 #include <io.h>
-#include <time.h>
 #endif
 
 #if defined(AU_FLAC_DLL) || defined(AU_OGGFLAC_DLL)
@@ -61,6 +61,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);
diff -up TiMidity++-2.13.2/timidity/effect.c~ TiMidity++-2.13.2/timidity/effect.c
--- TiMidity++-2.13.2/timidity/effect.c~	2008-04-03 15:59:16.000000000 +0200
+++ TiMidity++-2.13.2/timidity/effect.c	2008-04-03 15:59:16.000000000 +0200
@@ -29,6 +29,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include <stdlib.h>
+
 #ifndef NO_STRING_H
 #include <string.h>
 #else
diff -up TiMidity++-2.13.2/timidity/sndfont.c~ TiMidity++-2.13.2/timidity/sndfont.c
--- TiMidity++-2.13.2/timidity/sndfont.c~	2008-04-03 16:02:29.000000000 +0200
+++ TiMidity++-2.13.2/timidity/sndfont.c	2008-04-03 16:02:29.000000000 +0200
@@ -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)


Index: timidity++.spec
===================================================================
RCS file: /cvs/extras/rpms/timidity++/devel/timidity++.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- timidity++.spec	9 Mar 2008 08:38:51 -0000	1.28
+++ timidity++.spec	3 Apr 2008 14:29:07 -0000	1.29
@@ -1,7 +1,7 @@
 Summary: A software wavetable MIDI synthesizer
 Name: timidity++
 Version: 2.13.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/timidity/TiMidity++-%{version}.tar.bz2
 Source1: fedora-timidity.desktop
@@ -22,6 +22,7 @@
 Patch15: TiMidity++-2.13.2-dynlibroot.patch
 Patch16: TiMidity++-2.13.2-cfgfile-name.patch
 Patch17: TiMidity++-2.13.2-ipv6-fixes.patch
+Patch18: TiMidity++-2.13.2-missing-protos.patch
 
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +58,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 
 %build
@@ -119,6 +121,9 @@
 
 
 %changelog
+* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-15
+- Fix missing prototype compiler warnings
+
 * Sun Mar  9 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.13.2-14
 - Fix local ipv6 clients being rejected when running in server mode
 


