mupen64/mupenpatch4.diff

   1 diff -ruN mupen64_src-0.5/Makefile mupen64_src-0.5-new/Makefile
   2 --- mupen64_src-0.5/Makefile    2005-08-26 19:52:13.000000000 +0000
   3 +++ mupen64_src-0.5-new/Makefile        2007-06-10 12:16:46.000000000 +0000
   4 @@ -405,7 +405,7 @@
   5
   6  clean:
   7         find . -name '*.o' -print0 | xargs -0r rm -f
   8 -       rm mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so
   9 +       rm -f mupen64 mupen64_nogui mupen64_dbg plugins/mupen64_input.so blight_input/arial.ttf.c blight_input/ttftoh plugins/blight_input.so plugins/mupen64_hle_rsp_azimer.so plugins/dummyaudio.so plugins/mupen64_audio.so plugins/jttl_audio.so plugins/mupen64_soft_gfx.so plugins/glN64.so
  10
  11  clean_o:
  12         find . -name '*.o' -print0 | xargs -0r rm -f
  13 diff -ruN mupen64_src-0.5/blight_input/SDL_ttf.c mupen64_src-0.5-new/blight_input/SDL_ttf.c
  14 --- mupen64_src-0.5/blight_input/SDL_ttf.c      2005-08-26 19:52:16.000000000 +0000
  15 +++ mupen64_src-0.5-new/blight_input/SDL_ttf.c  2007-06-10 12:16:46.000000000 +0000
  16 @@ -47,12 +47,13 @@
  17  #include <freetype/freetype.h>
  18  #include <freetype/ftoutln.h>
  19  #include <freetype/ttnameid.h>
  20 -*/
  21 +
  22  #include <freetype/internal/ftobjs.h>
  23
  24  #ifndef FT_OPEN_STREAM
  25  #define FT_OPEN_STREAM ft_open_stream
  26  #endif
  27 +*/
  28
  29  #include "SDL.h"
  30  #include "SDL_endian.h"
  31 @@ -275,7 +276,7 @@
  32         }
  33         memset(stream, 0, sizeof(*stream));
  34
  35 -       stream->memory = library->memory;
  36 +       stream->memory = NULL;  /* set by FT_Open_Face */
  37         stream->read = RWread;
  38         stream->descriptor.pointer = src;
  39         stream->pos = (unsigned long)position;
  40 File mupen64_src-0.5/compare_pipe is a fifo while file mupen64_src-0.5-new/compare_pipe is a fifo
  41 diff -ruN mupen64_src-0.5/glN64/glATI.h mupen64_src-0.5-new/glN64/glATI.h
  42 --- mupen64_src-0.5/glN64/glATI.h       2005-08-26 19:52:17.000000000 +0000
  43 +++ mupen64_src-0.5-new/glN64/glATI.h   2007-06-10 12:17:37.000000000 +0000
  44 @@ -864,8 +864,8 @@
  45  typedef GLuint (APIENTRY *PFNGLGENFRAGMENTSHADERSATIPROC)(GLuint range);
  46  typedef GLvoid (APIENTRY *PFNGLBINDFRAGMENTSHADERATIPROC)(GLuint id);
  47  typedef GLvoid (APIENTRY *PFNGLDELETEFRAGMENTSHADERATIPROC)(GLuint id);
  48 -typedef GLvoid (APIENTRY *PFNGLBEGINFRAGMENTSHADERATIPROC)(GLvoid);
  49 -typedef GLvoid (APIENTRY *PFNGLENDFRAGMENTSHADERATIPROC)(GLvoid);
  50 +typedef GLvoid (APIENTRY *PFNGLBEGINFRAGMENTSHADERATIPROC)();
  51 +typedef GLvoid (APIENTRY *PFNGLENDFRAGMENTSHADERATIPROC)();
  52  typedef GLvoid (APIENTRY *PFNGLPASSTEXCOORDATIPROC)(GLuint dst, GLuint coord, GLenum swizzle);
  53  typedef GLvoid (APIENTRY *PFNGLSAMPLEMAPATIPROC)(GLuint dst, GLuint interp, GLenum swizzle);
  54  typedef GLvoid (APIENTRY *PFNGLCOLORFRAGMENTOP1ATIPROC)(GLenum op, GLuint dst, GLuint dstMask,
  55 @@ -2194,7 +2194,7 @@
  56  typedef GLvoid    (APIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
  57  typedef GLboolean (APIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
  58  typedef GLvoid    (APIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
  59 -typedef GLvoid    (APIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (GLvoid);
  60 +typedef GLvoid    (APIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) ();
  61  typedef GLvoid    (APIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
  62  typedef GLvoid    (APIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
  63
  64 diff -ruN mupen64_src-0.5/main/main.c mupen64_src-0.5-new/main/main.c
  65 --- mupen64_src-0.5/main/main.c 2005-08-26 19:52:11.000000000 +0000
  66 +++ mupen64_src-0.5-new/main/main.c     2007-06-10 12:16:46.000000000 +0000
  67 @@ -37,6 +37,8 @@
  68
  69  #include <stdlib.h>
  70  #include <unistd.h>
  71 +#include <dirent.h>
  72 +#include <sys/stat.h>
  73
  74  #include "main.h"
  75  #include "guifuncs.h"
  76 @@ -666,7 +668,7 @@
  77         i4 = old_i + atoi(s) - 1;
  78       }
  79
  80 -   printf("\n\nSelected Plugins: %s, %s, %s, %s\n", plugins[i1], plugins[i2], plugins[3], plugins[i4]);
  81 +   printf("\n\nSelected Plugins: %s, %s, %s, %s\n", plugins[i1], plugins[i2], plugins[i3], plugins[i4]);
  82
  83     plugin_load_plugins(plugins[i1], plugins[i2], plugins[i3], plugins[i4]);
  84     romOpen_gfx();
  85 diff -ruN mupen64_src-0.5/mupen64_audio/main.c mupen64_src-0.5-new/mupen64_audio/main.c
  86 --- mupen64_src-0.5/mupen64_audio/main.c        2005-08-26 19:52:17.000000000 +0000
  87 +++ mupen64_src-0.5-new/mupen64_audio/main.c    2007-06-10 12:16:46.000000000 +0000
  88 @@ -16,6 +16,7 @@
  89
  90  #include "../main/winlnxdefs.h"
  91  #include "Audio_#1.1.h"
  92 +#include "../config.h"
  93
  94  static AUDIO_INFO AudioInfo;
  95  static int dsp;
  96 @@ -172,6 +173,11 @@
  97
  98  static void GetPluginDir(char *Directory)
  99  {
 100 +#ifdef WITH_HOME
 101 +   strcpy(Directory, getenv("HOME"));
 102 +   strcat(Directory, "/.mupen64/");
 103 +   strcat(Directory, "plugins/");
 104 +#else
 105     int n = readlink("/proc/self/exe", Directory, PATH_MAX);
 106     if (n == -1)
 107       strcpy(Directory, "./");
 108 @@ -182,6 +188,7 @@
 109           Directory[strlen(Directory)-1] = '\0';
 110       }
 111     strcat(Directory, "plugins/");
 112 +#endif
 113  }
 114
 115  #ifdef USE_GTK