rpms/SDL_mixer/devel SDL_mixer-1.2.6-libmikmod.patch, NONE, 1.1 SDL_mixer.spec, 1.9, 1.10

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16497

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-libmikmod.patch 
Log Message:
* Tue Nov  8 2005 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-4
- Add libmikmod patch to fix Bug #171562. (Thanks, Ville)


SDL_mixer-1.2.6-libmikmod.patch:

--- NEW FILE SDL_mixer-1.2.6-libmikmod.patch ---
--- 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() ) {


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SDL_mixer.spec	27 Sep 2005 21:40:57 -0000	1.9
+++ SDL_mixer.spec	8 Nov 2005 14:53:04 -0000	1.10
@@ -1,14 +1,15 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
 License:	LGPL
 URL:		http://www.libsdl.org/projects/SDL_mixer/
 Source0:	http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz
-Patch1:		SDL_mixer-1.0.6-redhat.patch
-Patch4:		SDL_mixer-1.2.5-bad_code.patch
+Patch1:		%{name}-1.0.6-redhat.patch
+Patch2:		%{name}-1.2.6-libmikmod.patch
+Patch4:		%{name}-1.2.5-bad_code.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -44,6 +45,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .redhat
+%patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
 
 
@@ -87,6 +89,9 @@
 
 
 %changelog
+* Tue Nov  8 2005 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-4
+- Add libmikmod patch to fix Bug #171562. (Thanks, Ville)
+
 * Tue Sep 27 2005 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-3
 - Cleanup up spec formatting.