projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2257c2a)
Revision bump with upstream patch
authorTristan Heaven <tristan@gentoo.org>
Mon, 26 Feb 2007 07:06:24 +0000 (07:06 +0000)
committerTristan Heaven <tristan@gentoo.org>
Mon, 26 Feb 2007 07:06:24 +0000 (07:06 +0000)
Package-Manager: portage-2.1.2-r11

games-fps/alienarena/ChangeLog patch | blob | history
games-fps/alienarena/Manifest patch | blob | history
games-fps/alienarena/alienarena-20070224-r1.ebuild [moved from games-fps/alienarena/alienarena-20070224.ebuild with 80% similarity] patch | blob | history
games-fps/alienarena/files/alienarena-20070224-build.patch patch | blob | history
games-fps/alienarena/files/alienarena-20070224-gamedir.patch [new file with mode: 0644] patch | blob
games-fps/alienarena/files/alienarena-20070224-paths.patch patch | blob | history
games-fps/alienarena/files/digest-alienarena-20070224-r1 [moved from games-fps/alienarena/files/digest-alienarena-20070224 with 100% similarity] patch | blob | history

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 3a6fa0fad3ed224f0823760312f5931df990c47a..8024b6d41997404bc366a314f49f712cb39fd68c 100644 (file)
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/alienarena
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.1 2007/02/25 10:15:30 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.2 2007/02/26 07:06:24 nyhm Exp $
+
+*alienarena-20070224-r1 (26 Feb 2007)
+
+  26 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/alienarena-20070224-gamedir.patch, +alienarena-20070224-r1.ebuild:
+  Revision bump with upstream patch
 
 *alienarena-20070224 (25 Feb 2007)
 
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
index acf8bfa9c2c1bc7bf3fad0dbad22ebcf44987bf4..a21a3450f4a50da0715327c450c20e5e6a3031ba 100644 (file)
--- a/games-fps/alienarena/Manifest
+++ b/games-fps/alienarena/Manifest
@@ -1,38 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX alienarena-20070224-build.patch 5240 RMD160 a5afb9454badb5ca01cbafcd3f34731de665bc77 SHA1 377f8a71e23f6ce201aa3a7ea142dbcf1d2863c5 SHA256 75de5ffe658da13893ba6d0a2987fb044b08518398584a11f31071ce6d2e9cc6
-MD5 1d4f8e12e2dde1e6667f7dcd8ce6ffae files/alienarena-20070224-build.patch 5240
-RMD160 a5afb9454badb5ca01cbafcd3f34731de665bc77 files/alienarena-20070224-build.patch 5240
-SHA256 75de5ffe658da13893ba6d0a2987fb044b08518398584a11f31071ce6d2e9cc6 files/alienarena-20070224-build.patch 5240
+AUX alienarena-20070224-build.patch 1121 RMD160 d0baa14a461e79cf78d16c18e8266265efd236a3 SHA1 7f64411fdb026a37d095b1a6c2c7426723a18e76 SHA256 280623ae79c0e8d47b7f296a75d13f77ad63e314121a19ef3ecb87bb06dbf788
+MD5 e89b73d6b3b174daa43b139e6c6f808a files/alienarena-20070224-build.patch 1121
+RMD160 d0baa14a461e79cf78d16c18e8266265efd236a3 files/alienarena-20070224-build.patch 1121
+SHA256 280623ae79c0e8d47b7f296a75d13f77ad63e314121a19ef3ecb87bb06dbf788 files/alienarena-20070224-build.patch 1121
 AUX alienarena-20070224-exec-stack.patch 166 RMD160 0aba3db758691cb0e9f455a325576f25b88f367f SHA1 3898dc498731a3f6e56bb64aec61b76da9187e1f SHA256 7c94467bc8f0fca8db4390437f412331e31312d03f37bdb557329d2c095cce79
 MD5 c338665887152675dbe483bf0fa87966 files/alienarena-20070224-exec-stack.patch 166
 RMD160 0aba3db758691cb0e9f455a325576f25b88f367f files/alienarena-20070224-exec-stack.patch 166
 SHA256 7c94467bc8f0fca8db4390437f412331e31312d03f37bdb557329d2c095cce79 files/alienarena-20070224-exec-stack.patch 166
-AUX alienarena-20070224-paths.patch 1038 RMD160 f3714e668947ad175983507d4a352562b0cf203f SHA1 4c8282ff2bdc8dbe371780219208b69d6a1f0d8e SHA256 46a32ed8780530e7c3345207e014f799b5e8331e8d98a56806db392a3218d137
-MD5 3051a6536b7d190d895e1628c4364415 files/alienarena-20070224-paths.patch 1038
-RMD160 f3714e668947ad175983507d4a352562b0cf203f files/alienarena-20070224-paths.patch 1038
-SHA256 46a32ed8780530e7c3345207e014f799b5e8331e8d98a56806db392a3218d137 files/alienarena-20070224-paths.patch 1038
+AUX alienarena-20070224-gamedir.patch 261 RMD160 f1f5d26abca4bf184fc76c41fc72cd165f47fabd SHA1 b9837ea01e208c4d8b3ba8e869c32d17d0fece14 SHA256 cb7976cd62822842661e0aa6a4f3c649c1af8312408c345f1deda786b3e66236
+MD5 558d4954bfd92129c37191ed466c781c files/alienarena-20070224-gamedir.patch 261
+RMD160 f1f5d26abca4bf184fc76c41fc72cd165f47fabd files/alienarena-20070224-gamedir.patch 261
+SHA256 cb7976cd62822842661e0aa6a4f3c649c1af8312408c345f1deda786b3e66236 files/alienarena-20070224-gamedir.patch 261
+AUX alienarena-20070224-paths.patch 863 RMD160 012a47366255184cee2136459ad0bb01a70c2c1f SHA1 098c40938899d44680df844b419858ab76ed519c SHA256 4ff54c74688cbf43d74fede360310c662522af771bd36794c4232adbc0e3af0c
+MD5 a75f7094675e69f03e2b4b797591b0ea files/alienarena-20070224-paths.patch 863
+RMD160 012a47366255184cee2136459ad0bb01a70c2c1f files/alienarena-20070224-paths.patch 863
+SHA256 4ff54c74688cbf43d74fede360310c662522af771bd36794c4232adbc0e3af0c files/alienarena-20070224-paths.patch 863
 DIST alienarena2007-linux20070224-x86.zip 195661108 RMD160 8ca8ac8f652d6b75d353ca9af7fff80d4e3fdd66 SHA1 7e9bb1069828091e077b6986e999d41765632847 SHA256 62f4a33b2b3975174d7893fcc95cfde4fadad02ab67da90b74827e5b854918d4
-EBUILD alienarena-20070224.ebuild 2663 RMD160 2df8826456a952a55a5d392e6fa4bbf193e10e5e SHA1 056992debaf94c8a00fd228278c505c603f5b19f SHA256 9c630132eccd12b5eb4c0e6f3bd5288d6a3d67c4779c803a9d4c9f5abfe26362
-MD5 0b2690967f090d458ea97e2bb8269c9c alienarena-20070224.ebuild 2663
-RMD160 2df8826456a952a55a5d392e6fa4bbf193e10e5e alienarena-20070224.ebuild 2663
-SHA256 9c630132eccd12b5eb4c0e6f3bd5288d6a3d67c4779c803a9d4c9f5abfe26362 alienarena-20070224.ebuild 2663
-MISC ChangeLog 540 RMD160 693e8a99ada7791b9ad8684dd2609a4831cab939 SHA1 f629474d4d3ec68e6f6dd299d10470c8f84ceef7 SHA256 dfa746c3def8ddbe208c7c272a902a6e4458a61d55a594ebac5165b116bdd657
-MD5 ad95116ed496fd220b13a410f1407eb6 ChangeLog 540
-RMD160 693e8a99ada7791b9ad8684dd2609a4831cab939 ChangeLog 540
-SHA256 dfa746c3def8ddbe208c7c272a902a6e4458a61d55a594ebac5165b116bdd657 ChangeLog 540
+EBUILD alienarena-20070224-r1.ebuild 2773 RMD160 97021e285bc0683c508d7014d5e670b5460875cb SHA1 6e2bc72e4ada12bc48bd52f991d130581d455449 SHA256 7e57bbaa58707b41091751b0256df1a534e955bcdf1a0ef4a08f69f65f257382
+MD5 523378dcadf51a943a06a34e522338b6 alienarena-20070224-r1.ebuild 2773
+RMD160 97021e285bc0683c508d7014d5e670b5460875cb alienarena-20070224-r1.ebuild 2773
+SHA256 7e57bbaa58707b41091751b0256df1a534e955bcdf1a0ef4a08f69f65f257382 alienarena-20070224-r1.ebuild 2773
+MISC ChangeLog 740 RMD160 38b1a85a54f566cf7b2bf41f192b24299eb00572 SHA1 b7b5db7f2401c96cace26141cf4ad99e8cb1aa1a SHA256 30cabb0e569a85ae266f52b4c2a924cb8d7ea8462ed268c60948f7d7dc49e124
+MD5 468c1f6acf682fa1297ea96fa42c53f7 ChangeLog 740
+RMD160 38b1a85a54f566cf7b2bf41f192b24299eb00572 ChangeLog 740
+SHA256 30cabb0e569a85ae266f52b4c2a924cb8d7ea8462ed268c60948f7d7dc49e124 ChangeLog 740
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 bbbb88d8d843d358e0164ba74ad0e37a files/digest-alienarena-20070224 298
-RMD160 abf0835b2842366fa468974ec26eb3abc00b4f74 files/digest-alienarena-20070224 298
-SHA256 c3bfc994214b80376544c9265619bde383a537af3e6727fa635a1c5b8327c73a files/digest-alienarena-20070224 298
+MD5 bbbb88d8d843d358e0164ba74ad0e37a files/digest-alienarena-20070224-r1 298
+RMD160 abf0835b2842366fa468974ec26eb3abc00b4f74 files/digest-alienarena-20070224-r1 298
+SHA256 c3bfc994214b80376544c9265619bde383a537af3e6727fa635a1c5b8327c73a files/digest-alienarena-20070224-r1 298
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF4db4dz7hIScOURERAuajAJ9NZimZWvqSKEh15AvxhYsFg0cSHACglETP
-+KFna4Qr4iqno2Qy+aXDbFw=
-=t5NL
+iD8DBQFF4ocEdz7hIScOURERAuJ6AKDl0vtw8CPpb/E/+mMJSFvipLywcACfVU6z
+/Oiv0bA7PXabB8SSqRI47jg=
+=nsx/
 -----END PGP SIGNATURE-----
diff --git a/games-fps/alienarena/alienarena-20070224.ebuild b/games-fps/alienarena/alienarena-20070224-r1.ebuild
similarity index 80%
rename from games-fps/alienarena/alienarena-20070224.ebuild
rename to games-fps/alienarena/alienarena-20070224-r1.ebuild
index 05d4951dea77bb692efc5b370ddac25d88b20669..f9c61c27acbb28518aa478a5c1269e1b94ca1c0e 100644 (file)
--- a/games-fps/alienarena/alienarena-20070224.ebuild
+++ b/games-fps/alienarena/alienarena-20070224-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070224.ebuild,v 1.2 2007/02/25 18:35:14 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070224-r1.ebuild,v 1.1 2007/02/26 07:06:24 nyhm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -42,15 +42,19 @@ src_unpack() {
        epatch \
                "${FILESDIR}"/${P}-build.patch \
                "${FILESDIR}"/${P}-paths.patch \
-               "${FILESDIR}"/${P}-exec-stack.patch
+               "${FILESDIR}"/${P}-exec-stack.patch \
+               "${FILESDIR}"/${P}-gamedir.patch
+       sed -i \
+               -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+               -e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
+               source/linux/sys_linux.c \
+               || die "sed failed"
 }
 
 src_compile() {
        [[ $(gcc-fullversion) == "4.1.1" ]] && replace-flags -O? -O0
        emake \
                CC="$(tc-getCC)" \
-               GENTOO_LIBDIR="${GAMES_LIBDIR}"/${PN} \
-               GENTOO_DATADIR="${GAMES_DATADIR}"/${PN} \
                $(use sdl && echo SDLSOUND=1) \
                $(use opengl || use sdl && echo BUILD_ARENA=1) \
                $(use opengl || use sdl || use dedicated || echo BUILD_ARENA=1) \
@@ -59,24 +63,24 @@ src_compile() {
 }
 
 src_install() {
-       cd build
+       cd debug
        exeinto "${GAMES_LIBDIR}"/${PN}
-       doexe arena/game.so || die "doexe failed"
+       doexe game.so || die "doexe failed"
 
        if (use opengl || use sdl) || use opengl || use sdl || ! use dedicated ; then
-               newgamesbin crx ${PN}-oss || die "newgamesbin crx failed"
+               newgamesbin crx. ${PN}-oss || die "newgamesbin crx failed"
                make_desktop_entry ${PN}-oss "Alien Arena (OSS audio)" ${PN}.xpm
                use sdl || dosym ${PN}-oss "${GAMES_BINDIR}"/${PN}
        fi
 
        if use sdl ; then
-               newgamesbin crx.sdl ${PN}-sdl || die "newgamesbin crx.sdl failed"
+               newgamesbin crx.sdl. ${PN}-sdl || die "newgamesbin crx.sdl failed"
                make_desktop_entry ${PN}-sdl "Alien Arena (SDL audio)" ${PN}.xpm
                dosym ${PN}-sdl "${GAMES_BINDIR}"/${PN}
        fi
 
        if use dedicated ; then
-               newgamesbin crded ${PN}-ded || die "newgamesbin crded failed"
+               newgamesbin crded. ${PN}-ded || die "newgamesbin crded failed"
        fi
 
        cd "${WORKDIR}"/${MY_PN}
diff --git a/games-fps/alienarena/files/alienarena-20070224-build.patch b/games-fps/alienarena/files/alienarena-20070224-build.patch
index 6f42ab9028b20d2222174ec567c7648a51e8feb9..562701922bff7144d8c302e59ca62ca313789baa 100644 (file)
--- a/games-fps/alienarena/files/alienarena-20070224-build.patch
+++ b/games-fps/alienarena/files/alienarena-20070224-build.patch
@@ -1,35 +1,34 @@
 --- source/linux/Makefile
 +++ source/linux/Makefile
-@@ -28,7 +28,8 @@
+@@ -25,6 +25,7 @@
+ endif
+ endif
+ NOARCH=noarch
++ARCH=
  
  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__
++BASE_CFLAGS=$(CFLAGS) -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D__linux__
  
  ifeq ($(ARCH),axp)
  RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-@@ -79,8 +80,7 @@
+@@ -79,8 +80,8 @@
  
  ARENA_CFLAGS=-DARENA
  
 -DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 -LDFLAGS=-ldl -lm
++DEBUG_CFLAGS=$(BASE_CFLAGS) -fno-strict-aliasing
 +LDFLAGS+=-ldl -lm
  SVGALDFLAGS=-lvga -lm
  XLDFLAGS=-L/usr/X11R6/$(_LIB) -lX11 -lXext -lXxf86dga
  XCFLAGS=
-@@ -120,24 +120,27 @@
+@@ -120,10 +121,13 @@
        $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
        $(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
  else
@@ -37,157 +36,13 @@
 -      $(BUILDDIR)/crx.$(ARCH) \
 -      $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
 -      $(BUILDDIR)/arena/game$(ARCH).$(SHLIBEXT)
-+TARGETS=$(BUILDDIR)/arena/game.so
++TARGETS=$(BUILDDIR)/game$(ARCH).$(SHLIBEXT)
 +ifeq ($(BUILD_ARENA),1)
-+TARGETS+=$(BUILDDIR)/crx
++TARGETS+=$(BUILDDIR)/crx.$(ARCH)
 +endif
 +ifeq ($(BUILD_DED),1)
-+TARGETS+=$(BUILDDIR)/crded
++TARGETS+=$(BUILDDIR)/crded.$(ARCH)
 +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-gamedir.patch b/games-fps/alienarena/files/alienarena-20070224-gamedir.patch
new file mode 100644 (file)
index 0000000..97fc8dd
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070224-gamedir.patch
@@ -0,0 +1,11 @@
+--- source/qcommon/files.c
++++ source/qcommon/files.c
+@@ -1019,6 +1019,8 @@
+       fs_gamedirvar = Cvar_Get ("game", "", CVAR_LATCH|CVAR_SERVERINFO);
+       if (fs_gamedirvar->string[0])
+               FS_SetGamedir (fs_gamedirvar->string);
++      else
++              FS_SetGamedir ("arena");
+ }
+ 
+ 
diff --git a/games-fps/alienarena/files/alienarena-20070224-paths.patch b/games-fps/alienarena/files/alienarena-20070224-paths.patch
index 2acbb2dd5ef2b7461d122bd38134c607b7e3c558..121c9f39f66c31e9055a996be9d692206e2456a8 100644 (file)
--- a/games-fps/alienarena/files/alienarena-20070224-paths.patch
+++ b/games-fps/alienarena/files/alienarena-20070224-paths.patch
@@ -1,10 +1,3 @@
---- 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 @@
@@ -29,7 +22,7 @@
                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);
++              snprintf (name, MAX_OSPATH, "%s/%s", "GENTOO_LIBDIR", gamename);
  
                /* skip it if it just doesn't exist */
                fp = fopen(name, "rb");
@@ -37,7 +30,7 @@
        saved_euid = geteuid();
        seteuid(getuid());
  
-+      chdir(GENTOO_DATADIR);
++      chdir("GENTOO_DATADIR");
        Qcommon_Init(argc, argv);
  
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
Unnamed repository; edit this file 'description' to name the repository.