- updated to work with 1.40

Changed files:
    doomlegacy-nosndstat.patch -> 1.1.2.1
    doomlegacy-paths.patch -> 1.3.2.1
    doomlegacy-sound.patch -> 1.1.2.1

diff --git a/doomlegacy-nosndstat.patch b/doomlegacy-nosndstat.patch
index 2afb0150d70bf168d2a93fdfba6d74055966ad2a..2311c48b8581f78a09bfdb1f521fa3345d2a6be0 100644 (file)
--- a/doomlegacy-nosndstat.patch
+++ b/doomlegacy-nosndstat.patch
@@ -1,6 +1,6 @@
---- doomlegacy-1.32/doomlegacy/linux_x/musserv/sequencer.c.orig        Fri May 11 14:55:27 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/musserv/sequencer.c     Wed Jul 18 17:26:02 2001
-@@ -176,11 +176,7 @@
+--- doomlegacy_src/linux_x/musserv/sequencer.c.orig    Sat Feb 22 21:25:59 2003
++++ doomlegacy_src/linux_x/musserv/sequencer.c Sat Feb 22 21:27:23 2003
+@@ -177,11 +177,7 @@
    seq_dev = num_fm;
  
    sndstat = fopen("/dev/sndstat", "r");
@@ -13,14 +13,13 @@
    fgets(sndver, 100, sndstat);
    for (x = 0; x < strlen(sndver); x++)
      if (sndver[x] == '-')
-@@ -198,7 +194,9 @@
+@@ -199,6 +195,9 @@
        }
    voxdate = atoi(snddate);
    fclose(sndstat);
--
 +  } else {
-+    voxdate = 0; /* kernel 2.4 doesn't have sndstat */
++   voxdate = 0; /* kernel 2.4 doesn't have sndstat */
 +  }
+ 
    voices = malloc(sinfo[seq_dev].nr_voices * sizeof(struct synth_voice));
    for (x = 0; x < sinfo[seq_dev].nr_voices; x++)
-     {

diff --git a/doomlegacy-paths.patch b/doomlegacy-paths.patch
index 79ea756543b15b23a7cc82488a601f16df64903b..c9bdf13c7c31162959481014b5e7d6907b74e90d 100644 (file)
--- a/doomlegacy-paths.patch
+++ b/doomlegacy-paths.patch
@@ -1,52 +1,5 @@
---- doomlegacy-1.32/doomlegacy/linux_x/i_video_xshm.c.orig     Fri May 11 14:54:59 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/i_video_xshm.c  Sat Jun 30 10:55:58 2001
-@@ -1896,7 +1896,7 @@
-         
-        rendermode = render_opengl;
-        //dlptr = dlopen("./r_opengl.so",RTLD_LAZY);
--       dlptr = dlopen("./r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
-+       dlptr = dlopen("/usr/X11R6/lib/doomlegacy/r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
-        if(!dlptr) {
-           fprintf(stderr,"Error opening r_opengl.so!\n%s\n",dlerror());
-           rendermode = render_soft;
---- doomlegacy-1.32/doomlegacy/d_main.c.orig   Fri May 11 14:33:54 2001
-+++ doomlegacy-1.32/doomlegacy/d_main.c        Sat Jun 30 10:54:48 2001
-@@ -979,15 +979,7 @@
-     // change to the directory where 'doom3.wad' is found
-    I_LocateWad();
- #endif
--    doomwaddir = getenv("DOOMWADDIR");
--    if (!doomwaddir)
--    {
--        // get the current directory (possible problem on NT with "." as current dir)
--        if ( getcwd(pathtemp, _MAX_PATH) != NULL )
--            doomwaddir = pathtemp;
--        else
--            doomwaddir = ".";
--    }
-+    doomwaddir = getenv("DOOMWADDIR") ? getenv("DOOMWADDIR") : "/usr/X11R6/share/doomlegacy";
-         
- #ifdef __MACOS__
-         // cwd is always "/" when app is dbl-clicked
---- doomlegacy-1.32/doomlegacy/linux_x/i_system.c.orig Fri May 11 14:54:58 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/i_system.c      Wed Jul 18 15:33:51 2001
-@@ -119,10 +119,10 @@
- extern int             eventtail;
- 
- // Locations for searching the doom3.wad
--#define DEFAULTWADLOCATION1 "/usr/local/games/legacy"
--#define DEFAULTWADLOCATION2 "/usr/games/legacy"
--#define DEFAULTSEARCHPATH1 "/usr/local"
--#define DEFAULTSEARCHPATH2 "/usr/games"
-+#define DEFAULTWADLOCATION1 "/usr/X11R6/share/doomlegacy"
-+#define DEFAULTWADLOCATION2 "/usr/share/games/doomlegacy"
-+#define DEFAULTSEARCHPATH1 "/usr/share/games"
-+#define DEFAULTSEARCHPATH2 "/usr/X11R6/share"
- #define WADKEYWORD "doom3.wad"
- 
- // holds wad path
---- doomlegacy-1.32/doomlegacy/linux_x/musserv/musserver.c.orig        Fri May 11 14:55:26 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/musserv/musserver.c     Wed Jul 18 15:35:53 2001
+--- doomlegacy_src/linux_x/musserv/musserver.c.orig    Sat Feb 22 20:51:24 2003
++++ doomlegacy_src/linux_x/musserv/musserver.c Sat Feb 22 20:52:15 2003
 @@ -122,9 +122,7 @@
      ppid = getpid();
      if (verbose > 1) 
@@ -58,28 +11,77 @@
  
      while ((x = getopt(argc, argv, "acd:fhi:lmt:u:Vv")) != -1)
        switch (x)
---- doomlegacy-1.32/doomlegacy/linux_x/musserv/readwad.c.orig  Fri May 11 14:55:27 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/musserv/readwad.c       Wed Jul 18 15:37:09 2001
+--- doomlegacy_src/linux_x/musserv/readwad.c.orig      Sat Feb 22 20:52:25 2003
++++ doomlegacy_src/linux_x/musserv/readwad.c   Sat Feb 22 20:53:03 2003
 @@ -213,7 +213,7 @@
      FILE *fp;
  
      if (!(waddir = getenv("DOOMWADDIR")))
 -        waddir = ".";
-+        waddir = "/usr/X11R6/share/doomlegacy";
++      waddir = "/usr/X11R6/share/doomlegacy";
  
      wadfilename = malloc(2 + strlen(s) + strlen(waddir));
      if (*s != '/')
---- doomlegacy-1.32/doomlegacy/linux_x/searchp.c.orig  Fri May 11 14:54:59 2001
-+++ doomlegacy-1.32/doomlegacy/linux_x/searchp.c       Wed Jul 18 15:46:11 2001
-@@ -23,6 +23,11 @@
+--- doomlegacy_src/linux_x/i_video_xshm.c.orig Sat Feb 22 20:45:02 2003
++++ doomlegacy_src/linux_x/i_video_xshm.c      Sat Feb 22 20:46:49 2003
+@@ -1984,7 +1984,7 @@
+        rendermode = render_opengl;
+ 
+        // try to open library in CWD
+-       dlptr = dlopen("./r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
++      dlptr = dlopen("/usr/lib/share/doomlegacy/r_opengl.so",RTLD_NOW | RTLD_GLOBAL);
+ 
+        if(!dlptr) {
+          // try to open in LIBPATH
+--- doomlegacy_src/linux_x/i_system.c.orig     Sat Feb 22 20:48:37 2003
++++ doomlegacy_src/linux_x/i_system.c  Sat Feb 22 20:50:55 2003
+@@ -141,9 +141,9 @@
+ extern int             eventtail;
+ 
+ // Locations for searching the legacy.dat
+-#define DEFAULTWADLOCATION1 "/usr/local/games/legacy"
+-#define DEFAULTWADLOCATION2 "/usr/games/legacy"
+-#define DEFAULTSEARCHPATH1 "/usr/local"
++#define DEFAULTWADLOCATION1 "/usr/X11R6/share/doomlegacy"
++#define DEFAULTWADLOCATION2 "/usr/X11R6/share/games/doomlegacy"
++#define DEFAULTSEARCHPATH1 "/usr/X11R6/share/games/"
+ #define DEFAULTSEARCHPATH2 "/usr/games"
+ #define DEFAULTSEARCHPATH2 "/usr/games"
+ #define WADKEYWORD "legacy.dat"
+ 
+--- doomlegacy_src/linux_x/searchp.c.orig      Sat Feb 22 20:53:41 2003
++++ doomlegacy_src/linux_x/searchp.c   Sat Feb 22 20:54:22 2003
+@@ -22,6 +22,12 @@
+       static char     b[2048];
        struct stat     s;
        char            pb[2048];
- 
-+      strcpy(b,"/usr/X11R6/lib/doomlegacy/");
++      
++      strcpy(b,"/usr/X11R6/lib/doomlegacy_src/");
 +      strcat(b,file);
 +      if (stat(b, &s) == 0) {
 +              return(b);
 +      }
+ 
        /* get PATH, if not set just return filename, might be in cwd */
          /* added "./" for current path 19990416 by Kin */
-       if ((path = getenv("PATH")) == NULL) {
+--- doomlegacy_src/d_main.c.orig       Sat Feb 22 20:47:20 2003
++++ doomlegacy_src/d_main.c    Sat Feb 22 20:48:10 2003
+@@ -1022,16 +1022,8 @@
+     // change to the directory where 'legacy.dat' is found
+    I_LocateWad();
+ #endif
+-    doomwaddir = getenv("DOOMWADDIR");
+-    if (!doomwaddir)
+-    {
+-        // get the current directory (possible problem on NT with "." as current dir)
+-        if ( getcwd(pathtemp, _MAX_PATH) != NULL )
+-            doomwaddir = pathtemp;
+-        else
+-            doomwaddir = ".";
+-    }
+-        
++      doomwaddir = getenv("DOOMWADDIR") ? getenv("DOOMWADDIR") : "/usr/X11R6/share/doomlegacy";
++
+ #ifdef __MACOS__
+         // cwd is always "/" when app is dbl-clicked
+         if (!stricmp(doomwaddir,"/"))

diff --git a/doomlegacy-sound.patch b/doomlegacy-sound.patch
index cba341dad598e9baf616f91885eb7799fac63f57..93571c34ce19ae208d3ba43d111df35fc7bfecb5 100644 (file)
--- a/doomlegacy-sound.patch
+++ b/doomlegacy-sound.patch
@@ -5,7 +5,7 @@
      return;
  
 -  fn_snd = searchpath(sndserver_cmd.string);
-+  fn_snd = "/usr/lib/doomlegacy/llsndserv";
++  fn_snd = "/usr/X11R6/lib/doomlegacy/llsndserv";
    
    // start sound process
    if ( !access(fn_snd, X_OK) )
@@ -14,7 +14,7 @@
  
  #ifdef MUSSERV
 -  fn_mus = searchpath(musserver_cmd.string);
-+  fn_mus = "/usr/lib/doomlegacy/musserver";
++  fn_mus = "/usr/X11R6/lib/doomlegacy/musserver";
  
    // now try to start the music server process
    if (!access(fn_mus, X_OK)) {