diff options
Diffstat (limited to 'games-fps/aaquake2/files')
| -rw-r--r-- | games-fps/aaquake2/files/0.1-gentoo.patch | 90 | ||||
| -rw-r--r-- | games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch | 39 | ||||
| -rw-r--r-- | games-fps/aaquake2/files/aaquake2-0.1-glibc.patch | 22 | ||||
| -rw-r--r-- | games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch | 97 |
4 files changed, 0 insertions, 248 deletions
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch deleted file mode 100644 index cc7bb1733f64..000000000000 --- a/games-fps/aaquake2/files/0.1-gentoo.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- linux/Makefile.old -+++ linux/Makefile -@@ -54,7 +54,7 @@ - RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - else --RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ -+RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - endif - -@@ -92,7 +92,7 @@ - ############################################################################# - - ifeq ($(ARCH),axp) --TARGETS=$(BUILDDIR)/q2ded \ -+TARGETS=\ - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \ - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \ - # $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \ -@@ -100,11 +100,7 @@ - else - TARGETS=$(BUILDDIR)/quake2 \ - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \ -- $(BUILDDIR)/ref_soft.$(SHLIBEXT) \ -- $(BUILDDIR)/ref_softx.$(SHLIBEXT) \ - $(BUILDDIR)/ref_softaa.$(SHLIBEXT) \ -- $(BUILDDIR)/ref_gl.$(SHLIBEXT) \ -- $(BUILDDIR)/ref_glx.$(SHLIBEXT) \ - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \ - # $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \ - # $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) -@@ -125,9 +121,6 @@ - build_release: - @-mkdir $(BUILD_RELEASE_DIR) \ - $(BUILD_RELEASE_DIR)/client \ -- $(BUILD_RELEASE_DIR)/ded \ -- $(BUILD_RELEASE_DIR)/ref_soft \ -- $(BUILD_RELEASE_DIR)/ref_gl \ - $(BUILD_RELEASE_DIR)/game \ - $(BUILD_RELEASE_DIR)/ctf \ - # $(BUILD_RELEASE_DIR)/xatrix \ ---- linux/sys_linux.c.old -+++ linux/sys_linux.c -@@ -220,7 +220,7 @@ - char curpath[MAX_OSPATH];
- char *path;
- #ifdef __i386__
-- const char *gamename = "gamei386.so";
-+ const char *gamename = "GENTOO_DIR/gamei386.so";
- #elif defined __alpha__
- const char *gamename = "gameaxp.so";
- #else
-@@ -250,6 +250,14 @@ - {
- Com_Printf ("LoadLibrary (%s)\n",name);
- break;
-+ } else {
-+ sprintf (name, "%s", gamename);
-+ game_library = dlopen (name, RTLD_LAZY );
-+ if (game_library)
-+ {
-+ Com_Printf ("LoadLibrary (%s)\n",name);
-+ break;
-+ }
- }
- }
-
---- qcommon/files.c.old -+++ qcommon/files.c -@@ -865,7 +865,7 @@ - //
- // start up with baseq2 by default
- //
-- FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
-+ FS_AddGameDirectory (va(BASEDIRNAME) );
-
- // any set gamedirs will be freed up to here
- fs_base_searchpaths = fs_searchpaths;
---- qcommon/qcommon.h.old -+++ qcommon/qcommon.h -@@ -25,7 +25,7 @@ -
- #define VERSION 3.21
-
--#define BASEDIRNAME "baseq2"
-+#define BASEDIRNAME GENTOO_DATADIR
-
- #ifdef WIN32
-
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch deleted file mode 100644 index bb2e8e5979e5..000000000000 --- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- game/g_local.h.old -+++ game/g_local.h -@@ -458,11 +458,6 @@ - extern int sm_meat_index;
- extern int snd_fry;
-
--extern int jacket_armor_index;
--extern int combat_armor_index;
--extern int body_armor_index;
--
--
- // means of death
- #define MOD_UNKNOWN 0
- #define MOD_BLASTER 1
---- ctf/g_local.h.old -+++ ctf/g_local.h -@@ -466,11 +466,6 @@ - extern int sm_meat_index;
- extern int snd_fry;
-
--extern int jacket_armor_index;
--extern int combat_armor_index;
--extern int body_armor_index;
--
--
- // means of death
- #define MOD_UNKNOWN 0
- #define MOD_BLASTER 1
-@@ -556,10 +556,6 @@ -
- extern cvar_t *sv_maplist;
-
--//ZOID
--extern qboolean is_quad;
--//ZOID
--
- #define world (&g_edicts[0])
-
- // item spawnflags
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch deleted file mode 100644 index 638e91b2c393..000000000000 --- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- rw_aa.c.old -+++ rw_aa.c -@@ -61,7 +61,7 @@ - #include <signal.h>
- #include <sys/mman.h>
-
--#include <asm/io.h>
-+#include <sys/io.h>
-
- #include <aalib.h>
-
---- rw_in_aa.c.old -+++ rw_in_aa.c -@@ -46,7 +46,7 @@ - #include <signal.h>
- #include <sys/mman.h>
-
--#include <asm/io.h>
-+#include <sys/io.h>
-
- #include <aalib.h>
-
diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch deleted file mode 100644 index dc2359ac48d7..000000000000 --- a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- Makefile.old -+++ Makefile -@@ -59,7 +59,7 @@ - endif - - DEBUG_CFLAGS=$(BASE_CFLAGS) -g --LDFLAGS=-ldl -lm -+LDLIBS=-ldl -lm - SVGALDFLAGS=-lvga -lm - XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga - AALDFLAGS=-lm -laa -@@ -195,7 +195,7 @@ - endif - - $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) -- $(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS) - - $(BUILDDIR)/client/cl_cin.o : $(CLIENT_DIR)/cl_cin.c - $(DO_CC) -@@ -374,7 +374,7 @@ - $(BUILDDIR)/ded/cd_null.o - - $(BUILDDIR)/q2ded : $(Q2DED_OBJS) -- $(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS) - - $(BUILDDIR)/ded/cmd.o : $(COMMON_DIR)/cmd.c - $(DO_DED_CC) -@@ -503,7 +503,7 @@ - $(BUILDDIR)/game/m_flash.o - - $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) - - $(BUILDDIR)/game/g_ai.o : $(GAME_DIR)/g_ai.c - $(DO_SHLIB_CC) -@@ -682,7 +682,7 @@ - $(BUILDDIR)/ctf/q_shared.o - - $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS) - - $(BUILDDIR)/ctf/g_ai.o : $(CTF_DIR)/g_ai.c - $(DO_SHLIB_CC) -@@ -821,7 +821,7 @@ - $(BUILDDIR)/xatrix/q_shared.o - - $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS) - - $(BUILDDIR)/xatrix/g_ai.o : $(XATRIX_DIR)/g_ai.c - $(DO_SHLIB_CC) -@@ -1048,7 +1048,7 @@ - $(BUILDDIR)/rogue/q_shared.o - - $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS) - - $(BUILDDIR)/rogue/dm_ball.o : $(ROGUE_DIR)/dm_ball.c - $(DO_SHLIB_CC) -@@ -1291,15 +1291,15 @@ - $(BUILDDIR)/ref_soft/rw_in_aa.o - - $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \ - $(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS) - - $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ - $(REF_SOFT_X11_OBJS) $(XLDFLAGS) - - $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ - $(REF_SOFT_AA_OBJS) $(AALDFLAGS) - - $(BUILDDIR)/ref_soft/r_aclip.o : $(REF_SOFT_DIR)/r_aclip.c -@@ -1445,10 +1445,10 @@ - $(BUILDDIR)/ref_gl/gl_glx.o - - $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS) - - $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) -- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS) - - $(BUILDDIR)/ref_gl/gl_draw.o : $(REF_GL_DIR)/gl_draw.c - $(DO_GL_SHLIB_CC) |