[patch] 1.2.5-libmikmod.patch

1.2.5-libmikmod.patch (text/plain), 2.20 KB, created by Paul de Vrieze (RETIRED) on 2004-05-23 13:30:53 UTC

diff -ur SDL_mixer-1.2.5.orig/music.c SDL_mixer-1.2.5/music.c
--- SDL_mixer-1.2.5.orig/music.c	2003-02-12 05:07:12.000000000 +0000
+++ SDL_mixer-1.2.5/music.c	2004-05-23 19:42:15.120923224 +0000
@@ -1066,7 +1066,7 @@
 			if ( ! Player_Active() ) {
 				return(-1);
 			}
-			Player_SetSynchroValue(i);
+//			Player_SetSynchroValue(i);
 			return 0;
 			break;
 #endif
@@ -1088,7 +1088,8 @@
 			if ( ! Player_Active() ) {
 				return(-1);
 			}
-			return Player_GetSynchroValue();
+			return -1;
+//			return Player_GetSynchroValue();
 			break;
 #endif
 		    default:
@@ -1110,8 +1111,8 @@
 #endif
 #ifdef MOD_MUSIC
 	MikMod_Exit();
-	MikMod_UnregisterAllLoaders();
-	MikMod_UnregisterAllDrivers();
+//	MikMod_UnregisterAllLoaders();
+//	MikMod_UnregisterAllDrivers();
 #endif
 }
 
--- SDL_mixer-1.2.5.orig/configure.in	2003-02-04 20:59:41.000000000 +0000
+++ SDL_mixer-1.2.5/configure.in	2004-05-23 20:14:34.246131384 +0000
@@ -108,7 +108,7 @@
               , enable_music_mod=yes)
 if test x$enable_music_mod = xyes; then
     CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
-    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
+    SYSTEM_LIBS="$SYSTEM_LIBS -lmikmod"
 fi
 AC_ARG_ENABLE(music-midi,
 [  --enable-music-midi     enable MIDI music via timidity [default=yes]],
--- SDL_mixer-1.2.5.orig/Makefile.am	2003-02-09 00:14:39.000000000 +0000
+++ SDL_mixer-1.2.5/Makefile.am	2004-05-23 20:17:16.856410864 +0000
@@ -3,7 +3,7 @@
 lib_LTLIBRARIES = libSDL_mixer.la
 
 SUBDIRS = @MUSIC_SUBDIRS@
-DIST_SUBDIRS = mikmod timidity native_midi native_midi_gpl
+DIST_SUBDIRS = timidity native_midi native_midi_gpl
 
 libSDL_mixerincludedir = $(includedir)/SDL
 libSDL_mixerinclude_HEADERS =	\
@@ -29,11 +29,6 @@
 	effects_internal.c	\
 	effects_internal.h
 
-if USE_MIKMOD
-MIKMOD_LIB = mikmod/libmikmod.la
-else
-MIKMOD_LIB =
-endif
 if USE_TIMIDITY
 TIMIDITY_LIB = timidity/libtimidity.la
 else
@@ -62,7 +57,7 @@
 libSDL_mixer_la_LDFLAGS = 		\
 	-release $(LT_RELEASE)	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libSDL_mixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
+libSDL_mixer_la_LIBADD = $(TIMIDITY_LIB) $(NATIVE_MIDI_LIB) @SYSTEM_LIBS@ @SDL_LIBS@
 
 noinst_PROGRAMS = playwave playmus