add support for ia64 with patch from Émeric Maschino via bug #509212

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

11 files changed, 143 insertions, 66 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index 652f8ef82146..d5165e8bf06f 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for games-fps/quake2-icculus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.48 2014/07/04 08:19:46 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.49 2015/03/27 06:40:34 mr_bones_ Exp $
+
+  27 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/quake2-icculus-0.16.1-ia64.patch, files/0.16-rogue-armor.patch,
+  files/0.16-rogue-nan.patch, files/quake2-icculus-0.16.1-alsa.patch,
+  files/quake2-icculus-0.16.1-amd64.patch,
+  files/quake2-icculus-0.16.1-gcc41.patch,
+  files/quake2-icculus-0.16.1-gentoo-paths.patch,
+  files/quake2-icculus-0.16.1-gnusource.patch,
+  files/quake2-icculus-0.16.1-ldflags.patch,
+  files/quake2-icculus-0.16.1-no-asm-io.patch,
+  files/quake2-icculus-0.16.1-x11_mouse.patch,
+  files/quake2-icculus-0.16.1-x11_soft.patch, quake2-icculus-0.16.1-r1.ebuild:
+  add support for ia64 with patch from Émeric Maschino via bug #509212
 
   04 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
   quake2-icculus-0.16.1-r1.ebuild:
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
index 33c524fcbedf..194f965a0501 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
@@ -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;
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
index 5db9d892c006..0961fa68a985 100644
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
@@ -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>
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
index bab60d3b8f42..185359373c4b 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
@@ -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
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
index 2afa968d23f0..626cf5a1b64d 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
@@ -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;
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
index c017051583b8..61f0bb2286e5 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
@@ -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 @@ diff -u -p -r1.56 Makefile
  
  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 @@ diff -u -p -r1.9 qgl_linux.c
  		}
  		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 @@ diff -u -p -r1.10 vid_so.c
  }
  
  /*****************************************************************************/
-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 @@ diff -u -p -r1.11 files.c
  
  	//
  	// 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
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
index cc7c8451293b..ad1f37309c30 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
@@ -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.
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
new file mode 100644
index 000000000000..ae1aa2e4068c
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
@@ -0,0 +1,97 @@
+--- 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
+ 
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
index ec37b8be0fe8..978c9c9820ea 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
@@ -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
  
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
index b4a7dcc2eb94..6dc6f0f1ddfb 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
@@ -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 
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 2566266fac29..65a90a14703d 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.29 2014/07/04 08:19:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.30 2015/03/27 06:40:34 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs games
@@ -15,7 +15,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
 IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
 
 UIDEPEND="aalib? ( media-libs/aalib )
@@ -39,17 +39,9 @@ S=${WORKDIR}/${MY_P}
 pkg_setup() {
 	games_pkg_setup
 
-	local alert_user
-
 	if ! use qmax && $( use opengl || use sdl ) ; then
-		einfo "The 'qmax' graphical improvements are recommended."
+		elog "The 'qmax' graphical improvements are recommended."
 		echo
-		alert_user=y
-	fi
-
-	if [[ -n "${alert_user}" ]] ; then
-		ebeep
-		epause
 	fi
 }
 
@@ -78,7 +70,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gnusource.patch \
 		"${FILESDIR}"/${P}-x11_soft.patch \
 		"${FILESDIR}"/${P}-x11_mouse.patch \
-		"${FILESDIR}"/${P}-alsa.patch
+		"${FILESDIR}"/${P}-alsa.patch \
+		"${FILESDIR}"/${P}-ia64.patch
 
 	if use xatrix ; then
 		epatch "${FILESDIR}/${P}"-gcc41.patch