r3913 - in packages/trunk/fenix/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-28 13:41:24 +0000 (Tue, 28 Aug 2007)
New Revision: 3913

Added:
   packages/trunk/fenix/debian/patches/fxi_sdl_mixer_use_rwops.patch
Modified:
   packages/trunk/fenix/debian/changelog
   packages/trunk/fenix/debian/patches/series
Log:
Added patch fxi_sdl_mixer_use_rwops.patch



Modified: packages/trunk/fenix/debian/changelog
===================================================================
--- packages/trunk/fenix/debian/changelog	2007-08-28 13:30:49 UTC (rev 3912)
+++ packages/trunk/fenix/debian/changelog	2007-08-28 13:41:24 UTC (rev 3913)
@@ -2,7 +2,9 @@
 
   [ Miriam Ruiz ]
   * Added new patch to correct FTBFS problem. Closes: #438607
-  * Added patch for missing function prototype definition in fxi/src/i_func.c
+  * Added patch fxi_pal.pathc for missing function prototype definition
+    in fxi/src/i_func.c and fxi_sdl_mixer_use_rwops.patch to use the
+    Mix_LoadMUS_RW() function.
     Thanks to Dann Frazier <dannf at debian.org>. Closes: #437735
   * Added copyright and license to patches.
 

Added: packages/trunk/fenix/debian/patches/fxi_sdl_mixer_use_rwops.patch
===================================================================
--- packages/trunk/fenix/debian/patches/fxi_sdl_mixer_use_rwops.patch	                        (rev 0)
+++ packages/trunk/fenix/debian/patches/fxi_sdl_mixer_use_rwops.patch	2007-08-28 13:41:24 UTC (rev 3913)
@@ -0,0 +1,27 @@
+# Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
+# Licensed under the GPL, see /usr/share/common-licenses/GPL
+# Thanks to Dann Frazier <dannf at debian.org>
+# See http://bugs.debian.org/437735
+
+#  From SDL_mixer.h:
+#
+#    #ifdef USE_RWOPS /* This hasn't been hooked into music.c yet */
+#    /* Load a music file from an SDL_RWop object (MikMod-specific currently)
+#       Matt Campbell (matt at campbellhome.dhs.org) April 2000 */
+#    extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *rw);
+#    #endif
+
+Index: fenix-0.92a.dfsg1/fxi/inc/sound.h
+===================================================================
+--- fenix-0.92a.dfsg1.orig/fxi/inc/sound.h	2007-08-28 13:36:39.000000000 +0000
++++ fenix-0.92a.dfsg1/fxi/inc/sound.h	2007-08-28 13:37:18.000000000 +0000
+@@ -27,7 +27,8 @@
+ #ifndef __SOUND_H
+ #define __SOUND_H
+ 
+-#include "SDL_mixer.h"
++#define USE_RWOPS
++#include <SDL/SDL_mixer.h>
+ 
+ void            sound_init      ();
+ void            sound_close     ();

Modified: packages/trunk/fenix/debian/patches/series
===================================================================
--- packages/trunk/fenix/debian/patches/series	2007-08-28 13:30:49 UTC (rev 3912)
+++ packages/trunk/fenix/debian/patches/series	2007-08-28 13:41:24 UTC (rev 3913)
@@ -16,3 +16,4 @@
 0.92a_to_cvs-20070713.1513.patch
 endianess.patch
 fxi_pal.patch
+fxi_sdl_mixer_use_rwops.patch