This commit was manufactured by cvs2git to create branch 'RA-branch'.

Cherrypick from master 2003-03-14 07:14:36 UTC ankry <ankry@pld-linux.org> 'e4499b1585c4e4abe4b98a77461698b0  doomlegacy-vidmodes.patch':
    doomlegacy-nocmap.patch -> 1.1
    doomlegacy-sdl.desktop -> 1.2
    doomlegacy-vidmodes.patch -> 1.1
    doomlegacy-x11.desktop -> 1.2
    doomlegacy.png -> 1.1

diff --git a/doomlegacy-nocmap.patch b/doomlegacy-nocmap.patch
new file mode 100644 (file)
index 0000000..488e87f
--- /dev/null
+++ b/doomlegacy-nocmap.patch
@@ -0,0 +1,30 @@
+--- doomlegacy-1.40/doomlegacy_src/linux_x/i_video_xshm.c.orig Fri Mar  7 22:22:56 2003
++++ doomlegacy-1.40/doomlegacy_src/linux_x/i_video_xshm.c      Fri Mar  7 22:51:25 2003
+@@ -1619,14 +1619,14 @@
+     if(rendermode==render_soft) {
+     // setup attributes for main window
+     if (vidmode_active) {
+-       attribmask = CWColormap | CWSaveUnder | CWBackingStore | 
++       attribmask = CWSaveUnder | CWBackingStore | 
+           CWEventMask | CWOverrideRedirect;
+ 
+        attribs.override_redirect = True;
+        attribs.backing_store = NotUseful;
+        attribs.save_under = False;
+     } else
+-       attribmask = CWBorderPixel | CWColormap | CWEventMask;
++       attribmask = CWBorderPixel | CWEventMask;
+ 
+     attribs.event_mask = KeyPressMask | KeyReleaseMask
+ #ifndef POLL_POINTER
+@@ -1634,7 +1634,10 @@
+ #endif
+        | ExposureMask | StructureNotifyMask;
+     
++    if( x_pseudo ) {
++    attribmask |= CWColormap;
+     attribs.colormap = X_cmap;
++    }
+     attribs.border_pixel = 0;
+     
+     // create the main window

diff --git a/doomlegacy-sdl.desktop b/doomlegacy-sdl.desktop
new file mode 100644 (file)
index 0000000..3c980b7
--- /dev/null
+++ b/doomlegacy-sdl.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=SDLdoom
+Comment=Doom - SDL version
+Comment[pl]=Doom - wersja SDL
+Exec=lsdldoom
+Icon=doomlegacy.png
+Terminal=0
+Type=Application
+# vi: encoding=utf-8

diff --git a/doomlegacy-vidmodes.patch b/doomlegacy-vidmodes.patch
new file mode 100644 (file)
index 0000000..6b8b278
--- /dev/null
+++ b/doomlegacy-vidmodes.patch
@@ -0,0 +1,44 @@
+--- doomlegacy-1.40/doomlegacy_src/linux_x/i_video_xshm.c~     Fri Mar 14 03:11:35 2003
++++ doomlegacy-1.40/doomlegacy_src/linux_x/i_video_xshm.c      Fri Mar 14 03:11:35 2003
+@@ -182,7 +182,9 @@
+ // resolution threshold for hires mode
+ #define HIRES_HORIZ (640)
+ #define HIRES_VERT  (400)
+- 
++
++#define MAX_NUM_VIDMODES (100) 
++
+ static boolean haveVoodoo = false;
+ 
+ extern consvar_t cv_fullscreen; // for fullscreen support under X and GLX
+@@ -197,8 +199,8 @@
+ static int lowest_vidmode;
+ 
+ static XF86VidModeModeInfo **vidmodes;
+-static char vidModeName[33][32]; // allow 33 different modes
+-static int vidmap[33];
++static char vidModeName[MAX_NUM_VIDMODES][32]; // allow MAX_NUM_VIDMODES different modes
++static int vidmap[MAX_NUM_VIDMODES];
+ 
+ // added for 1.27 19990220 by Kin
+ rendermode_t    rendermode=render_soft;
+@@ -283,7 +285,8 @@
+    if(vidmode_ext) {
+        // get fullscreen modes
+        XF86VidModeGetAllModeLines(X_display, X_screen, &num_fullvidmodes, &vidmodes);
+-       num_vidmodes = num_fullvidmodes;
++       num_vidmodes = (num_fullvidmodes > MAX_NUM_VIDMODES)
++                        ? MAX_NUM_VIDMODES : num_fullvidmodes;
+        
+        // initialize mapping
+        for(i=0; i<num_vidmodes; i++) 
+@@ -1824,7 +1827,8 @@
+     if(haveVoodoo) // nothing to do
+         return;
+    if(vidmode_ext && cv_fullscreen.value) {
+-      num_vidmodes = num_fullvidmodes;
++      num_vidmodes = (num_fullvidmodes > MAX_NUM_VIDMODES)
++                       ? MAX_NUM_VIDMODES : num_fullvidmodes;
+ 
+       // initialize mapping
+       for(i=0; i<num_vidmodes; i++) 

diff --git a/doomlegacy-x11.desktop b/doomlegacy-x11.desktop
new file mode 100644 (file)
index 0000000..934fbe0
--- /dev/null
+++ b/doomlegacy-x11.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=X11doom
+Comment=Doom - X11 version
+Comment[pl]=Doom - wersja X11
+Exec=llxdoom
+Icon=doomlegacy.png
+Terminal=0
+Type=Application
+# vi: encoding=utf-8

diff --git a/doomlegacy.png b/doomlegacy.png
new file mode 100644 (file)
index 0000000..4eebfd3
Binary files /dev/null and b/doomlegacy.png differ