summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2007-02-25 10:15:30 +0000
committerTristan Heaven <nyhm@gentoo.org>2007-02-25 10:15:30 +0000
commitfb40acabd4ec02101c06f3bfb922c0f2f7d43ebf (patch)
tree4b95b1731a00ea8a0bbb3a864e6ce204048f942f /games-fps/alienarena/files
parentSpeed up cleanup of staled zebra routes, thanks to Jan Oravec <jan.oravec at ... (diff)
downloadgentoo-2-fb40acabd4ec02101c06f3bfb922c0f2f7d43ebf.tar.gz
gentoo-2-fb40acabd4ec02101c06f3bfb922c0f2f7d43ebf.tar.bz2
gentoo-2-fb40acabd4ec02101c06f3bfb922c0f2f7d43ebf.zip
Initial commit, based on Paul Bredbury's ebuild from bug #110972
(Portage version: 2.1.2-r11)
Diffstat (limited to 'games-fps/alienarena/files')
-rw-r--r--games-fps/alienarena/files/alienarena-20070224-build.patch193
-rw-r--r--games-fps/alienarena/files/alienarena-20070224-exec-stack.patch9
-rw-r--r--games-fps/alienarena/files/alienarena-20070224-paths.patch43
-rw-r--r--games-fps/alienarena/files/digest-alienarena-200702243
4 files changed, 248 insertions, 0 deletions
diff --git a/games-fps/alienarena/files/alienarena-20070224-build.patch b/games-fps/alienarena/files/alienarena-20070224-build.patch
new file mode 100644
index 000000000000..6f42ab9028b2
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070224-build.patch
@@ -0,0 +1,193 @@
+--- source/linux/Makefile
++++ source/linux/Makefile
+@@ -28,7 +28,8 @@
+
+ MOUNT_DIR=..
+
+-BUILD_DEBUG_DIR=debug$(ARCH)
++BUILDDIR=build
++BUILD_DEBUG_DIR=$(BUILDDIR)
+ BUILD_RELEASE_DIR=release$(ARCH)
+ CLIENT_DIR=$(MOUNT_DIR)/client
+ SERVER_DIR=$(MOUNT_DIR)/server
+@@ -50,7 +51,7 @@
+ _LIB := lib
+ endif
+
+-BASE_CFLAGS=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
++CFLAGS+=-Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
+
+ ifeq ($(ARCH),axp)
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
+@@ -79,8 +80,7 @@
+
+ ARENA_CFLAGS=-DARENA
+
+-DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+-LDFLAGS=-ldl -lm
++LDFLAGS+=-ldl -lm
+ SVGALDFLAGS=-lvga -lm
+ XLDFLAGS=-L/usr/X11R6/$(_LIB) -lX11 -lXext -lXxf86dga
+ XCFLAGS=
+@@ -120,24 +120,27 @@
+ $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
+ $(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
+ else
+-TARGETS=$(BUILDDIR)/crded.$(ARCH) \
+- $(BUILDDIR)/crx.$(ARCH) \
+- $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
+- $(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
++TARGETS=$(BUILDDIR)/arena/game.so
++ifeq ($(BUILD_ARENA),1)
++TARGETS+=$(BUILDDIR)/crx
++endif
++ifeq ($(BUILD_DED),1)
++TARGETS+=$(BUILDDIR)/crded
++endif
+ endif
+
+ ifeq ($(strip $(SDLSOUND)),1)
+- TARGETS+=$(BUILDDIR)/crx.sdl.$(ARCH)
++ TARGETS+=$(BUILDDIR)/crx.sdl
+ endif
+
+-build_debug:
++targets: mkdirs $(TARGETS)
++mkdirs:
+ @-mkdir $(BUILD_DEBUG_DIR) \
+ $(BUILD_DEBUG_DIR)/client \
+ $(BUILD_DEBUG_DIR)/ded \
+ $(BUILD_DEBUG_DIR)/ref_gl \
+ $(BUILD_DEBUG_DIR)/game \
+ $(BUILD_DEBUG_DIR)/arena
+- $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS)"
+
+ build_release:
+ @-mkdir $(BUILD_RELEASE_DIR) \
+@@ -150,7 +153,6 @@
+
+ all: build_debug build_release
+
+-targets: $(TARGETS)
+
+ #############################################################################
+ # CLIENT/SERVER
+@@ -242,14 +244,14 @@
+ endif
+
+
+-$(BUILDDIR)/crx.$(ARCH) : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
++$(BUILDDIR)/crx : $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+ $(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_OSS_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
+
+-$(BUILDDIR)/crx.sdl.$(ARCH) : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
++$(BUILDDIR)/crx.sdl : $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
+ $(CC) $(CFLAGS) -o $@ $(CODERED_OBJS) $(SOUND_SDL_OBJS) $(CODERED_AS_OBJS) $(LDFLAGS) $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS) $(SDLLDFLAGS)
+
+ $(BUILDDIR)/client/cl_cin.o : $(CLIENT_DIR)/cl_cin.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/cl_ents.o : $(CLIENT_DIR)/cl_ents.c
+ $(DO_CC)
+@@ -291,13 +293,13 @@
+ $(DO_CC)
+
+ $(BUILDDIR)/client/menu.o : $(CLIENT_DIR)/menu.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/snd_dma.o : $(CLIENT_DIR)/snd_dma.c
+ $(DO_CC)
+
+ $(BUILDDIR)/client/snd_mem.o : $(CLIENT_DIR)/snd_mem.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/snd_mix.o : $(CLIENT_DIR)/snd_mix.c
+ $(DO_CC)
+@@ -306,10 +308,10 @@
+ $(DO_CC)
+
+ $(BUILDDIR)/client/cmd.o : $(COMMON_DIR)/cmd.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/cmodel.o : $(COMMON_DIR)/cmodel.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/common.o : $(COMMON_DIR)/common.c
+ $(DO_CC)
+@@ -354,7 +356,7 @@
+ $(DO_CC)
+
+ $(BUILDDIR)/client/sv_user.o : $(SERVER_DIR)/sv_user.c
+- $(DO_CC)
++ $(DO_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/client/sv_world.o : $(SERVER_DIR)/sv_world.c
+ $(DO_CC)
+@@ -405,7 +407,7 @@
+ $(DO_GL_SHLIB_CC)
+
+ $(BUILDDIR)/ref_gl/r_script.o : $(REF_GL_DIR)/r_script.c
+- $(DO_GL_SHLIB_CC)
++ $(DO_GL_SHLIB_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/ref_gl/r_surf.o : $(REF_GL_DIR)/r_surf.c
+ $(DO_GL_SHLIB_CC)
+@@ -414,7 +416,7 @@
+ $(DO_GL_SHLIB_CC)
+
+ $(BUILDDIR)/ref_gl/r_image.o : $(REF_GL_DIR)/r_image.c
+- $(DO_GL_SHLIB_CC)
++ $(DO_GL_SHLIB_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/ref_gl/r_mesh.o : $(REF_GL_DIR)/r_mesh.c
+ $(DO_GL_SHLIB_CC)
+@@ -478,14 +480,14 @@
+ $(BUILDDIR)/ded/cl_null.o \
+ $(BUILDDIR)/ded/cd_null.o
+
+-$(BUILDDIR)/crded.$(ARCH) : $(CRDED_OBJS)
++$(BUILDDIR)/crded : $(CRDED_OBJS)
+ $(CC) $(CFLAGS) -o $@ $(CRDED_OBJS) $(LDFLAGS)
+
+ $(BUILDDIR)/ded/cmd.o : $(COMMON_DIR)/cmd.c
+- $(DO_DED_CC)
++ $(DO_DED_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/ded/cmodel.o : $(COMMON_DIR)/cmodel.c
+- $(DO_DED_CC)
++ $(DO_DED_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/ded/common.o : $(COMMON_DIR)/common.c
+ $(DO_DED_CC)
+@@ -530,7 +532,7 @@
+ $(DO_DED_CC)
+
+ $(BUILDDIR)/ded/sv_user.o : $(SERVER_DIR)/sv_user.c
+- $(DO_DED_CC)
++ $(DO_DED_CC) -fno-strict-aliasing
+
+ $(BUILDDIR)/ded/sv_world.o : $(SERVER_DIR)/sv_world.c
+ $(DO_DED_CC)
+@@ -597,7 +599,7 @@
+
+
+
+-$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
++$(BUILDDIR)/game.so : $(GAME_OBJS)
+ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
+
+
+@@ -753,7 +755,7 @@
+ $(BUILDDIR)/arena/p_weapon.o \
+ $(BUILDDIR)/arena/vehicles.o
+
+-$(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT) : $(ARENA_OBJS)
++$(BUILDDIR)/arena/game.so : $(ARENA_OBJS)
+ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ARENA_OBJS)
+
+
diff --git a/games-fps/alienarena/files/alienarena-20070224-exec-stack.patch b/games-fps/alienarena/files/alienarena-20070224-exec-stack.patch
new file mode 100644
index 000000000000..2bd10445e2f8
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070224-exec-stack.patch
@@ -0,0 +1,9 @@
+--- source/linux/snd_mixa.s
++++ source/linux/snd_mixa.s
+@@ -191,3 +191,6 @@
+
+ #endif // id386
+
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-fps/alienarena/files/alienarena-20070224-paths.patch b/games-fps/alienarena/files/alienarena-20070224-paths.patch
new file mode 100644
index 000000000000..2acbb2dd5ef2
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070224-paths.patch
@@ -0,0 +1,43 @@
+--- source/linux/Makefile
++++ source/linux/Makefile
+@@ -1,3 +1,4 @@
++CFLAGS+=-DGENTOO_DATADIR=\"$(GENTOO_DATADIR)\" -DGENTOO_LIBDIR=\"$(GENTOO_LIBDIR)\"
+ #
+ # CodeRED Makefile
+ #
+--- source/linux/sys_linux.c
++++ source/linux/sys_linux.c
+@@ -217,6 +217,8 @@
+ char name[MAX_OSPATH];
+ char *path;
+ char *str_p;
++ const char *gamename = "game.so";
++/*
+ #if defined __i386__
+ const char *gamename = "gamei386.so";
+ #elif defined __x86_64__
+@@ -230,6 +232,7 @@
+ #else
+ #error Unknown arch
+ #endif
++*/
+
+ setreuid(getuid(), getuid());
+ setegid(getgid());
+@@ -246,7 +249,7 @@
+ path = FS_NextPath (path);
+ if (!path)
+ return NULL; // couldn't find one anywhere
+- snprintf (name, MAX_OSPATH, "%s/%s", path, gamename);
++ snprintf (name, MAX_OSPATH, "%s/%s", GENTOO_LIBDIR, gamename);
+
+ /* skip it if it just doesn't exist */
+ fp = fopen(name, "rb");
+@@ -320,6 +323,7 @@
+ saved_euid = geteuid();
+ seteuid(getuid());
+
++ chdir(GENTOO_DATADIR);
+ Qcommon_Init(argc, argv);
+
+ fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
diff --git a/games-fps/alienarena/files/digest-alienarena-20070224 b/games-fps/alienarena/files/digest-alienarena-20070224
new file mode 100644
index 000000000000..0c122c10025d
--- /dev/null
+++ b/games-fps/alienarena/files/digest-alienarena-20070224
@@ -0,0 +1,3 @@
+MD5 1348513890c6ba959e681e721add1fd4 alienarena2007-linux20070224-x86.zip 195661108
+RMD160 8ca8ac8f652d6b75d353ca9af7fff80d4e3fdd66 alienarena2007-linux20070224-x86.zip 195661108
+SHA256 62f4a33b2b3975174d7893fcc95cfde4fadad02ab67da90b74827e5b854918d4 alienarena2007-linux20070224-x86.zip 195661108