rpms/SDL_mixer/FC-5 SDL_mixer-1.2.6-64bit.patch, NONE, 1.1 SDL_mixer.spec, 1.12, 1.13

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-64bit.patch 
Log Message:
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
- Add patch to fix sound on x86_64. Bug #175672.


SDL_mixer-1.2.6-64bit.patch:

--- NEW FILE SDL_mixer-1.2.6-64bit.patch ---
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;


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/FC-5/SDL_mixer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
+++ SDL_mixer.spec	23 Apr 2006 15:55:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-1.0.6-redhat.patch
 Patch2:		%{name}-1.2.6-libmikmod.patch
 Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
+- Add patch to fix sound on x86_64. Bug #175672.
+
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6
 - rebuilt for new gcc4.1 snapshot and glibc changes