From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-fps/wolfgl/files/0.93-gcc.patch | 209 --------------------- games-fps/wolfgl/files/0.93-gcc4.patch | 80 -------- games-fps/wolfgl/files/0.93-sample-rate.patch | 11 -- games-fps/wolfgl/files/0.93-sprite.patch | 82 -------- games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch | 11 -- 5 files changed, 393 deletions(-) delete mode 100644 games-fps/wolfgl/files/0.93-gcc.patch delete mode 100644 games-fps/wolfgl/files/0.93-gcc4.patch delete mode 100644 games-fps/wolfgl/files/0.93-sample-rate.patch delete mode 100644 games-fps/wolfgl/files/0.93-sprite.patch delete mode 100644 games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch (limited to 'games-fps/wolfgl/files') diff --git a/games-fps/wolfgl/files/0.93-gcc.patch b/games-fps/wolfgl/files/0.93-gcc.patch deleted file mode 100644 index a22923393678..000000000000 --- a/games-fps/wolfgl/files/0.93-gcc.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -abur a/common/console.c b/common/console.c ---- a/common/console.c 2000-09-27 16:19:44.000000000 +0200 -+++ b/common/console.c 2003-09-11 19:59:46.037562040 +0200 -@@ -3,6 +3,14 @@ - #include "id_us.h" - #include "console.h" - -+#ifdef _LINUX -+#include -+#endif -+ -+#ifdef _LINUX -+#include -+#endif -+ - static char con_lines[32][45]; // buffer - static int con_active; // console is visible - static int con_current; // current line -diff -abur a/common/id_in.h b/common/id_in.h ---- a/common/id_in.h 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/id_in.h 2003-09-11 19:32:14.368653880 +0200 -@@ -178,6 +178,7 @@ - - void IN_Startup(); - void IN_Shutdown(); -+void IN_KeyEvent(unsigned char key); - void IN_Default(wbool gotit, ControlType in); - void IN_ClearKeysDown(); - void IN_ReadControl(int player, ControlInfo *info); -diff -abur a/common/id_vh.c b/common/id_vh.c ---- a/common/id_vh.c 2000-09-26 17:39:36.000000000 +0200 -+++ b/common/id_vh.c 2003-09-11 19:24:57.183116184 +0200 -@@ -230,3 +230,4 @@ - - } - */ -\ No newline at end of file -+ -diff -abur a/common/opengl.c b/common/opengl.c ---- a/common/opengl.c 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/opengl.c 2003-09-11 19:22:35.622636648 +0200 -@@ -1,5 +1,10 @@ - #include - #include -+ -+#ifdef _LINUX -+#include -+#endif -+ - #include "system.h" - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_act2.c b/common/wl_act2.c ---- a/common/wl_act2.c 2000-09-27 16:04:26.000000000 +0200 -+++ b/common/wl_act2.c 2003-09-11 19:19:45.511497472 +0200 -@@ -1,5 +1,9 @@ - // WL_ACT2.C - -+#ifdef _LINUX -+#include -+#endif -+ - #include "wl_def.h" - - //============================================================================= -diff -abur a/common/wl_agent.c b/common/wl_agent.c ---- a/common/wl_agent.c 2003-09-11 20:04:40.738760648 +0200 -+++ b/common/wl_agent.c 2003-09-11 19:57:06.860760592 +0200 -@@ -3,6 +3,10 @@ - #include - #include "wl_def.h" - -+#ifdef _LINUX -+#include -+#endif -+ - //============================================================================= - // LOCAL CONSTANTS - //============================================================================= -diff -abur a/common/wl_draw.c b/common/wl_draw.c ---- a/common/wl_draw.c 2003-09-11 20:04:40.739760496 +0200 -+++ b/common/wl_draw.c 2003-09-11 19:20:33.512200256 +0200 -@@ -2,6 +2,11 @@ - - #include - #include -+ -+#ifdef _LINUX -+#include -+#endif -+ - #include "system.h" - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_menu.c b/common/wl_menu.c ---- a/common/wl_menu.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_menu.c 2003-09-11 20:07:38.892677136 +0200 -@@ -5,6 +5,10 @@ - // - //////////////////////////////////////////////////////////////////// - -+#ifdef _LINUX -+#include "../linux/input.h" -+#endif -+ - #include - #include "opengl.h" - #include "wl_def.h" -diff -abur a/common/wl_menu.h b/common/wl_menu.h ---- a/common/wl_menu.h 2000-09-26 17:38:31.000000000 +0200 -+++ b/common/wl_menu.h 2003-09-11 18:31:41.593919584 +0200 -@@ -233,3 +233,4 @@ - void NonShareware(); - /*int GetYorN(int x,int y,int pic); - */ -\ No newline at end of file -+ -diff -abur a/common/wl_play.c b/common/wl_play.c ---- a/common/wl_play.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_play.c 2003-09-11 19:40:31.293109880 +0200 -@@ -1,6 +1,11 @@ - // WL_PLAY.C - - #include -+ -+#ifdef _LINUX -+#include "../linux/input.h" -+#endif -+ - #include "wl_def.h" - #include "system.h" - -diff -abur a/common/wl_state.c b/common/wl_state.c ---- a/common/wl_state.c 2000-09-27 16:04:27.000000000 +0200 -+++ b/common/wl_state.c 2003-09-11 19:23:26.895841936 +0200 -@@ -2,6 +2,10 @@ - - #include "wl_def.h" - -+#ifdef _LINUX -+#include -+#endif -+ - //============================================================================= - // GLOBAL VARIABLES - //============================================================================= -diff -abur a/common/wl_text.c b/common/wl_text.c ---- a/common/wl_text.c 2000-09-26 17:40:23.000000000 +0200 -+++ b/common/wl_text.c 2003-09-11 19:19:00.110399488 +0200 -@@ -4,6 +4,10 @@ - #include "wl_def.h" - #include "system.h" - -+#ifdef _LINUX -+#include -+#endif -+ - #ifndef SPEAR - - void FreeMusic(); // WL_MENU.C -diff -abur a/linux/sound.c b/linux/sound.c ---- a/linux/sound.c 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/sound.c 2003-09-11 19:55:16.702507192 +0200 -@@ -9,6 +9,8 @@ - #include - - #include -+#include -+#include - - #include - #include -diff -abur a/linux/sound.h b/linux/sound.h ---- a/linux/sound.h 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/sound.h 2003-09-11 19:44:03.663824624 +0200 -@@ -1,5 +1,8 @@ - void S_LoadSound(int id, void* data, long length); - void S_PlaySound(int id, int pan); -+void S_UpdateSound(); -+void S_InitSound(); -+void S_ShutDownSound(); - - extern int DigitalDevice; - -diff -abur a/linux/system.c b/linux/system.c ---- a/linux/system.c 2000-09-26 17:57:48.000000000 +0200 -+++ b/linux/system.c 2003-09-11 19:42:14.955350824 +0200 -@@ -1,9 +1,12 @@ - #include -+#include -+#include - #include - #include - #include - #include - #include "wl_def.h" -+#include "sound.h" - - int screen_width, screen_height; - Display *dpy; -@@ -117,7 +120,7 @@ - visinfo = glXChooseVisual( dpy, scrnum, attrib ); - if (!visinfo) { - printf("Error: couldn't get an RGB, Double-buffered visual\n"); -- exit(1); -+ _exit(1); - } - - /* window attributes */ diff --git a/games-fps/wolfgl/files/0.93-gcc4.patch b/games-fps/wolfgl/files/0.93-gcc4.patch deleted file mode 100644 index 5dcccd76049b..000000000000 --- a/games-fps/wolfgl/files/0.93-gcc4.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur wolfgl-0.93-orig/common/id_ca.c wolfgl-0.93/common/id_ca.c ---- wolfgl-0.93-orig/common/id_ca.c 2006-01-28 16:59:10.000000000 -0500 -+++ wolfgl-0.93/common/id_ca.c 2006-01-28 17:04:26.000000000 -0500 -@@ -252,6 +252,7 @@ - { - unsigned short ch,chhigh,count,offset; - unsigned short *copyptr, *inptr, *outptr; -+ unsigned char *uc_inptr; - - length/=2; - -@@ -268,13 +269,17 @@ - if (!count) - { - // have to insert a word containing the tag byte -- ch |= *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ ch |= *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - *outptr++ = ch; - length--; - } - else - { -- offset = *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ offset = *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - copyptr = outptr - offset; - length -= count; - while (count--) -@@ -287,7 +292,9 @@ - if (!count) - { - // have to insert a word containing the tag byte -- ch |= *((unsigned char*)inptr)++; -+ uc_inptr = (unsigned char*)inptr; -+ ch |= *(uc_inptr)++; -+ inptr = (unsigned short *)uc_inptr; - *outptr++ = ch; - length --; - } -@@ -806,7 +813,7 @@ - - for (i=0;inext ; check ; check=check->next) - if ((check->flags & FL_SHOOTABLE) -- //&& -+ && - // (check->flags & FL_VISABLE) && --// (abs(check->viewx - centerx) < shootdelta) -+ (abs(check->viewx - centerx) < shootdelta) - ) --// { -+ { - if (CheckLine(check)) --// if (check->transx < viewdist) -+ if (check->transx < viewdist) - { --// viewdist = check->transx; -+ viewdist = check->transx; - closest = check; -- break; - } --// } -+ } - - if (closest == oldclosest) - return; // no more targets, all missed - - // trace a line from player to enemey --// if (CheckLine(closest)) --// break; -+ if (CheckLine(closest)) -+ break; - } - - // hit something ---- a/common/wl_draw.c 2003-09-11 20:43:26.473195272 +0200 -+++ b/common/wl_draw.c 2003-09-11 20:46:57.859059736 +0200 -@@ -877,7 +877,7 @@ - tilespot = &tilemap[0][0]+spotloc; - - // could be in any of the nine surrounding tiles -- if ((*visspot) || -+ if (1 || (*visspot) || - (*(visspot-1) && !*(tilespot-1)) || - (*(visspot+1) && !*(tilespot+1)) || - (*(visspot-65) && !*(tilespot-65)) || -@@ -980,6 +980,8 @@ - - for (obj = player->next; obj; obj = obj->next) - { -+ int sprite; -+ - if (!areabyplayer[obj->areanumber]) - continue; - if (!gamestates[obj->state].shapenum) -@@ -989,10 +991,14 @@ - glTranslated((float)obj->x/(1<<16), (float)obj->y/(1<<16), 0); - glRotated(-player->angle, 0,0,1); - -- if (texture_index[PMSpriteStart+gamestates[obj->state].shapenum] == 0) -- CreateSprite(PMSpriteStart+gamestates[obj->state].shapenum); -+ sprite = gamestates[obj->state].shapenum; -+ if (gamestates[obj->state].rotate) -+ sprite += CalcRotate(obj); -+ -+ if (texture_index[PMSpriteStart+sprite] == 0) -+ CreateSprite(PMSpriteStart+sprite); - else -- glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+gamestates[obj->state].shapenum]); -+ glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+sprite]); - - glBegin(GL_QUADS); - glTexCoord2f(0,0); diff --git a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch deleted file mode 100644 index f9da771e1d79..000000000000 --- a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/linux/Makefile 2009-02-06 14:27:11.000000000 +0100 -+++ b/linux/Makefile 2009-02-06 14:27:40.000000000 +0100 -@@ -19,7 +19,7 @@ - @echo 'Do not call this file directly' - - wolfgl: $(LINUX_OBJS) $(COMMON_OBJS) -- $(CC) $(LINK_FLAGS) $(COMMON_OBJS) $(LINUX_OBJS) -o $(OUTDIR)/wolfgl -+ $(CC) $(LDFLAGS) $(COMMON_OBJS) $(LINUX_OBJS) $(LINK_FLAGS) -o $(OUTDIR)/wolfgl - - # common directory - -- cgit v1.2.3