rpms/SDL_mixer/EL-4 SDL_mixer-1.0.6-redhat.patch, 1.2, 1.3 SDL_mixer-1.2.5-bad_code.patch, 1.2, 1.3 SDL_mixer-1.2.6-64bit.patch, 1.2, 1.3 SDL_mixer-1.2.6-libmikmod.patch, 1.2, 1.3 SDL_mixer-1.2.7-bad-code.patch, 1.1, NONE SDL_mixer-1.2.7-fix-path-timidity.patch, 1.1, NONE SDL_mixer-1.2.7-volume.patch, 1.1, NONE

[Nigel Jones (nigelj)]

Author: nigelj

Update of /cvs/extras/rpms/SDL_mixer/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25837

Added Files:
	SDL_mixer-1.0.6-redhat.patch SDL_mixer-1.2.5-bad_code.patch 
	SDL_mixer-1.2.6-64bit.patch SDL_mixer-1.2.6-libmikmod.patch 
Removed Files:
	SDL_mixer-1.2.7-bad-code.patch 
	SDL_mixer-1.2.7-fix-path-timidity.patch 
	SDL_mixer-1.2.7-volume.patch 
Log Message:
Hope this works this time

SDL_mixer-1.0.6-redhat.patch:

Index: SDL_mixer-1.0.6-redhat.patch
===================================================================
RCS file: SDL_mixer-1.0.6-redhat.patch
diff -N SDL_mixer-1.0.6-redhat.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SDL_mixer-1.0.6-redhat.patch	9 Jun 2007 05:24:46 -0000	1.3
@@ -0,0 +1,11 @@
+--- SDL_mixer-1.0.6/timidity/config.h.redhat	Mon Nov 27 17:13:52 2000
++++ SDL_mixer-1.0.6/timidity/config.h	Mon Nov 27 17:14:09 2000
+@@ -202,7 +202,7 @@
+ 
+ /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
+    then specify the library directory in the configuration file. */
+-#define CONFIG_FILE	"timidity.cfg"
++#define CONFIG_FILE	"/etc/timidity.cfg"
+ #ifdef __WIN32__
+ #define DEFAULT_PATH	"\\TIMIDITY"
+ #else

SDL_mixer-1.2.5-bad_code.patch:

Index: SDL_mixer-1.2.5-bad_code.patch
===================================================================
RCS file: SDL_mixer-1.2.5-bad_code.patch
diff -N SDL_mixer-1.2.5-bad_code.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SDL_mixer-1.2.5-bad_code.patch	9 Jun 2007 05:24:46 -0000	1.3
@@ -0,0 +1,42 @@
+--- SDL_mixer-1.2.5/effect_position.c.bad_code	2004-04-22 14:01:10.540048437 +0200
++++ SDL_mixer-1.2.5/effect_position.c	2004-04-22 14:01:12.165824694 +0200
+@@ -153,16 +153,17 @@
+ 
+     for (i = 0; i < len; i += sizeof (Uint32)) {
+ #if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+-        *(p++) = (d[l[(*p & 0xFF000000) >> 24]] << 24) |
++        *p = (d[l[(*p & 0xFF000000) >> 24]] << 24) |
+                  (d[r[(*p & 0x00FF0000) >> 16]] << 16) |
+                  (d[l[(*p & 0x0000FF00) >>  8]] <<  8) |
+                  (d[r[(*p & 0x000000FF)      ]]      ) ;
+ #else
+-        *(p++) = (d[r[(*p & 0xFF000000) >> 24]] << 24) |
++        *p = (d[r[(*p & 0xFF000000) >> 24]] << 24) |
+                  (d[l[(*p & 0x00FF0000) >> 16]] << 16) |
+                  (d[r[(*p & 0x0000FF00) >>  8]] <<  8) |
+                  (d[l[(*p & 0x000000FF)      ]]      ) ;
+ #endif
++	p++;
+     }
+ }
+ 
+@@ -226,16 +227,17 @@
+ 
+     for (i = 0; i < len; i += sizeof (Uint32)) {
+ #if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+-        *(p++) = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
++        *p = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
+                  (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
+                  (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >>  8))+128]] <<  8) |
+                  (d[r[((Sint16)(Sint8)((*p & 0x000000FF)      ))+128]]      ) ;
+ #else
+-        *(p++) = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
++        *p = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
+                  (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
+                  (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >>  8))+128]] <<  8) |
+                  (d[l[((Sint16)(Sint8)((*p & 0x000000FF)      ))+128]]      ) ;
+ #endif
++	p++;
+     }
+ 
+ 

SDL_mixer-1.2.6-64bit.patch:

Index: SDL_mixer-1.2.6-64bit.patch
===================================================================
RCS file: SDL_mixer-1.2.6-64bit.patch
diff -N SDL_mixer-1.2.6-64bit.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SDL_mixer-1.2.6-64bit.patch	9 Jun 2007 05:24:46 -0000	1.3
@@ -0,0 +1,18 @@
+diff -ur SDL_mixer-1.2.6.OLD/timidity/config.h SDL_mixer-1.2.6/timidity/config.h
+--- SDL_mixer-1.2.6.OLD/timidity/config.h	2004-12-16 00:20:14.000000000 -0500
++++ SDL_mixer-1.2.6/timidity/config.h	2006-04-23 11:28:44.000000000 -0400
+@@ -185,14 +185,8 @@
+ #define LITTLE_ENDIAN
+ #endif
+ 
+-/* DEC MMS has 64 bit long words */
+-#ifdef DEC
+ typedef unsigned int uint32;
+ typedef int int32; 
+-#else
+-typedef unsigned long uint32;
+-typedef long int32; 
+-#endif
+ typedef unsigned short uint16;
+ typedef short int16;
+ typedef unsigned char uint8;

SDL_mixer-1.2.6-libmikmod.patch:

Index: SDL_mixer-1.2.6-libmikmod.patch
===================================================================
RCS file: SDL_mixer-1.2.6-libmikmod.patch
diff -N SDL_mixer-1.2.6-libmikmod.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ SDL_mixer-1.2.6-libmikmod.patch	9 Jun 2007 05:24:46 -0000	1.3
@@ -0,0 +1,33 @@
+--- SDL_mixer/music.c	2004/11/15 23:34:56	1.58
++++ SDL_mixer/music.c	2005/08/21 20:54:52	1.65
+@@ -329,6 +327,9 @@
+ int open_music(SDL_AudioSpec *mixer)
+ {
+ 	int music_error;
++#ifdef LIBMIKMOD_MUSIC
++	CHAR *list;
++#endif
+ 
+ 	music_error = 0;
+ #ifdef WAV_MUSIC
+@@ -390,11 +391,17 @@
+ 	md_mode |= DMODE_HQMIXER|DMODE_SOFT_MUSIC|DMODE_SURROUND;
+ #endif
+ #ifdef LIBMIKMOD_MUSIC
+-	if(!MikMod_InfoDriver())
++	list = MikMod_InfoDriver();
++	if ( list )
++	  free(list);
++	else
+ #endif
+-	MikMod_RegisterAllDrivers();
++	MikMod_RegisterDriver(&drv_nos);
+ #ifdef LIBMIKMOD_MUSIC
+-	if(!MikMod_InfoLoader())
++	list = MikMod_InfoLoader();
++	if ( list )
++	  free(list);
++	else
+ #endif
+ 	MikMod_RegisterAllLoaders();
+ 	if ( MikMod_Init() ) {


--- SDL_mixer-1.2.7-bad-code.patch DELETED ---


--- SDL_mixer-1.2.7-fix-path-timidity.patch DELETED ---


--- SDL_mixer-1.2.7-volume.patch DELETED ---