mr_bones_ 15/03/27 06:40:34
Modified: quake2-icculus-0.16.1-ldflags.patch
quake2-icculus-0.16.1-gcc41.patch
quake2-icculus-0.16.1-gnusource.patch
quake2-icculus-0.16.1-x11_mouse.patch
quake2-icculus-0.16.1-alsa.patch
0.16-rogue-armor.patch
quake2-icculus-0.16.1-gentoo-paths.patch
0.16-rogue-nan.patch
Added: quake2-icculus-0.16.1-ia64.patch
Log:
add support for ia64 with patch from Émeric Maschino via bug #509212
(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch?r1=1.1&r2=1.2
Index: quake2-icculus-0.16.1-ldflags.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake2-icculus-0.16.1-ldflags.patch 15 Sep 2010 10:56:43 -0000 1.1
+++ quake2-icculus-0.16.1-ldflags.patch 27 Mar 2015 06:40:34 -0000 1.2
@@ -1,5 +1,5 @@
---- Makefile.old 2010-09-15 09:31:41.000000000 +0200
-+++ Makefile 2010-09-15 10:13:01.000000000 +0200
+--- Makefile.old
++++ Makefile
@@ -169,18 +169,18 @@
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
1.2
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch?r1=1.1&r2=1.2
Index: quake2-icculus-0.16.1-gcc41.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake2-icculus-0.16.1-gcc41.patch 6 May 2006 10:15:39 -0000 1.1
+++ quake2-icculus-0.16.1-gcc41.patch 27 Mar 2015 06:40:34 -0000 1.2
@@ -1,5 +1,5 @@
---- src/xatrix/g_local.h.old 2006-05-06 11:58:32.000000000 +0200
-+++ src/xatrix/g_local.h 2006-05-06 11:58:52.000000000 +0200
+--- src/xatrix/g_local.h.old
++++ src/xatrix/g_local.h
@@ -446,11 +446,6 @@
extern int sm_meat_index;
extern int snd_fry;
1.2
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch?r1=1.1&r2=1.2
Index: quake2-icculus-0.16.1-gnusource.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake2-icculus-0.16.1-gnusource.patch 1 Apr 2012 17:08:10 -0000
1.1
+++ quake2-icculus-0.16.1-gnusource.patch 27 Mar 2015 06:40:34 -0000
1.2
@@ -1,6 +1,5 @@
-diff -Naur quake2-r0.16.1/src/linux/q_shlinux.c
quake2-r0.16.1-modified/src/linux/q_shlinux.c
---- quake2-r0.16.1/src/linux/q_shlinux.c 2002-02-09 17:09:23.000000000
-0500
-+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c 2007-06-26
13:40:25.000000000 -0400
+--- quake2-r0.16.1/src/linux/q_shlinux.c
++++ quake2-r0.16.1-modified/src/linux/q_shlinux.c
@@ -17,6 +17,9 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1.2
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch?r1=1.1&r2=1.2
Index: quake2-icculus-0.16.1-x11_mouse.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake2-icculus-0.16.1-x11_mouse.patch 6 Apr 2012 19:23:15 -0000
1.1
+++ quake2-icculus-0.16.1-x11_mouse.patch 27 Mar 2015 06:40:34 -0000
1.2
@@ -1,5 +1,5 @@
---- src/linux/rw_x11.c.old 2012-04-06 20:51:11.545642465 +0200
-+++ src/linux/rw_x11.c 2012-04-06 20:55:48.159425787 +0200
+--- src/linux/rw_x11.c.old
++++ src/linux/rw_x11.c
@@ -989,8 +989,8 @@
}
else
1.2
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch?r1=1.1&r2=1.2
Index: quake2-icculus-0.16.1-alsa.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- quake2-icculus-0.16.1-alsa.patch 28 Mar 2012 22:32:18 -0000 1.1
+++ quake2-icculus-0.16.1-alsa.patch 27 Mar 2015 06:40:34 -0000 1.2
@@ -1,7 +1,7 @@
---- src/linux/snd_alsa.c.old 2012-03-28 19:22:06.533174832 +0200
-+++ src/linux/snd_alsa.c 2012-03-28 19:22:19.670009575 +0200
+--- src/linux/snd_alsa.c.old
++++ src/linux/snd_alsa.c
@@ -22,13 +22,22 @@
- $Id: quake2-icculus-0.16.1-alsa.patch,v 1.1 2012/03/28 22:32:18 tupone
Exp $
+ $Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34
mr_bones_ Exp $
*/
-#define BUFFER_SIZE 4096
1.2 games-fps/quake2-icculus/files/0.16-rogue-armor.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-armor.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-armor.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-armor.patch?r1=1.1&r2=1.2
Index: 0.16-rogue-armor.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-armor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.16-rogue-armor.patch 27 Jun 2006 21:46:02 -0000 1.1
+++ 0.16-rogue-armor.patch 27 Mar 2015 06:40:34 -0000 1.2
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig 2006-06-24 16:50:49.000000000 +0200
-+++ src/rogue/g_local.h 2006-06-24 17:44:35.000000000 +0200
+--- src/rogue/g_local.h.orig
++++ src/rogue/g_local.h
@@ -545,9 +545,6 @@
extern int sm_meat_index;
extern int snd_fry;
1.4
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch?r1=1.3&r2=1.4
Index: quake2-icculus-0.16.1-gentoo-paths.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- quake2-icculus-0.16.1-gentoo-paths.patch 3 Nov 2005 18:30:24 -0000
1.3
+++ quake2-icculus-0.16.1-gentoo-paths.patch 27 Mar 2015 06:40:34 -0000
1.4
@@ -1,10 +1,5 @@
-Index: Makefile
-===================================================================
-RCS file: /cvs/cvsroot/quake2/Makefile,v
-retrieving revision 1.56
-diff -u -p -r1.56 Makefile
---- Makefile 5 May 2005 22:23:34 -0000 1.56
-+++ Makefile 29 Aug 2005 22:52:28 -0000
+--- Makefile
++++ Makefile
@@ -74,35 +74,46 @@ endif
CC=gcc
@@ -90,13 +85,8 @@
targets: $(TARGETS)
-Index: src/linux/qgl_linux.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/linux/qgl_linux.c,v
-retrieving revision 1.9
-diff -u -p -r1.9 qgl_linux.c
---- src/linux/qgl_linux.c 25 Sep 2002 13:39:58 -0000 1.9
-+++ src/linux/qgl_linux.c 29 Aug 2005 22:52:28 -0000
+--- src/linux/qgl_linux.c
++++ src/linux/qgl_linux.c
@@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname )
// dllname, dlerror());
@@ -118,13 +108,8 @@
}
Com_Printf ("Using %s for OpenGL...", fn);
} else {
-Index: src/linux/vid_so.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/linux/vid_so.c,v
-retrieving revision 1.10
-diff -u -p -r1.10 vid_so.c
---- src/linux/vid_so.c 24 Sep 2004 22:11:44 -0000 1.10
-+++ src/linux/vid_so.c 29 Aug 2005 22:52:28 -0000
+--- src/linux/vid_so.c
++++ src/linux/vid_so.c
@@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name )
//regain root
seteuid(saved_euid);
@@ -169,13 +154,8 @@
}
/*****************************************************************************/
-Index: src/qcommon/files.c
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/qcommon/files.c,v
-retrieving revision 1.11
-diff -u -p -r1.11 files.c
---- src/qcommon/files.c 2 Jan 2005 03:38:12 -0000 1.11
-+++ src/qcommon/files.c 29 Aug 2005 22:52:29 -0000
+--- src/qcommon/files.c
++++ src/qcommon/files.c
@@ -60,6 +60,7 @@ typedef struct pack_s
char fs_gamedir[MAX_OSPATH];
@@ -215,13 +195,8 @@
//
// then add a '.quake2/baseq2' directory in home directory by default
-Index: src/qcommon/qcommon.h
-===================================================================
-RCS file: /cvs/cvsroot/quake2/src/qcommon/qcommon.h,v
-retrieving revision 1.5
-diff -u -p -r1.5 qcommon.h
---- src/qcommon/qcommon.h 12 Apr 2005 13:12:21 -0000 1.5
-+++ src/qcommon/qcommon.h 29 Aug 2005 22:52:29 -0000
+--- src/qcommon/qcommon.h
++++ src/qcommon/qcommon.h
@@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit
#endif
1.2 games-fps/quake2-icculus/files/0.16-rogue-nan.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-nan.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-nan.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-nan.patch?r1=1.1&r2=1.2
Index: 0.16-rogue-nan.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-fps/quake2-icculus/files/0.16-rogue-nan.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0.16-rogue-nan.patch 3 Jan 2005 23:52:32 -0000 1.1
+++ 0.16-rogue-nan.patch 27 Mar 2015 06:40:34 -0000 1.2
@@ -1,5 +1,5 @@
---- src/rogue/g_local.h.orig 2005-01-03 02:16:03.233329552 -0500
-+++ src/rogue/g_local.h 2005-01-03 02:16:03.244327880 -0500
+--- src/rogue/g_local.h.orig
++++ src/rogue/g_local.h
@@ -24,3 +24,3 @@
#ifndef _WIN32
-#include <nan.h>
1.1
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch?rev=1.1&content-type=text/plain
Index: quake2-icculus-0.16.1-ia64.patch
===================================================================
--- quake2-r0.16.1.orig/Makefile
+++ quake2-r0.16.1/Makefile
@@ -54,24 +54,26 @@ endif
# this nice line comes from the linux kernel makefile
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e
s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
ifneq ($(ARCH),x86_64)
ifneq ($(ARCH),i386)
ifneq ($(ARCH),axp)
+ifneq ($(ARCH),ia64)
ifneq ($(ARCH),ppc)
ifneq ($(ARCH),sparc)
$(error arch $(ARCH) is currently not supported)
endif
endif
endif
endif
endif
+endif
CC=gcc
ifndef OPT_CFLAGS
ifeq ($(ARCH),axp)
OPT_CFLAGS=-ffast-math -funroll-loops \
-fomit-frame-pointer -fexpensive-optimizations
endif
@@ -283,16 +285,46 @@ ifeq ($(ARCH),axp)
$(warning Warning: SDL support not supported for $(ARCH))
endif
ifeq ($(strip $(BUILD_SDLGL)),YES)
$(warning Warning: SDLGL support not supported for $(ARCH))
endif
endif # ARCH axp
+ifeq ($(ARCH),ia64)
+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
+ TARGETS += $(BUILDDIR)/sdlquake2
+ endif
+
+ ifeq ($(strip $(BUILD_SVGA)),YES)
+ TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT)
+ endif
+
+ ifeq ($(strip $(BUILD_X11)),YES)
+ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
+ endif
+
+ ifeq ($(strip $(BUILD_GLX)),YES)
+ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
+ endif
+
+ ifeq ($(strip $(BUILD_FXGL)),YES)
+ TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT)
+ endif
+
+ ifeq ($(strip $(BUILD_SDL)),YES)
+ TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT)
+ endif
+
+ ifeq ($(strip $(BUILD_SDLGL)),YES)
+ TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT)
+ endif
+endif # ARCH ia64
+
ifeq ($(ARCH),ppc)
ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
TARGETS += $(BUILDDIR)/sdlquake2
endif
ifeq ($(strip $(BUILD_SVGA)),YES)
$(warning Warning: SVGAlib support not supported for $(ARCH))
endif
--- quake2-r0.16.1.orig/src/linux/sys_linux.c
+++ quake2-r0.16.1/src/linux/sys_linux.c
@@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
char *path;
char *str_p;
#if defined __i386__
const char *gamename = "gamei386.so";
#elif defined __x86_64__
const char *gamename = "gamex86_64.so";
#elif defined __alpha__
const char *gamename = "gameaxp.so";
+#elif defined __ia64__
+ const char *gamename = "gameia64.so";
#elif defined __powerpc__
const char *gamename = "gameppc.so";
#elif defined __sparc__
const char *gamename = "gamesparc.so";
#else
#error Unknown arch
#endif
