On amd64, select the glx video renderer by default until the software renderers work #86552.

Package-Manager: portage-2.0.51.20-r5

4 files changed, 31 insertions, 5 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index d3e2168d9e8c..2bfde4df2d15 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake2-icculus
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.12 2005/03/11 01:47:50 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.13 2005/04/30 06:14:20 vapier Exp $
+
+  30 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/quake2-icculus-0.16.1-amd64.patch, quake2-icculus-0.16.1.ebuild:
+  On amd64, select the glx video renderer by default until the software
+  renderers work #86552.
 
 *quake2-icculus-0.16.1 (10 Mar 2005)
 
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index c824b4770804..26cab988928c 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -1,9 +1,10 @@
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 7e986345680cf97667a4518c8d3343ae ChangeLog 2399
-MD5 36839a6c3df67cc64c72cba76aa2163d quake2-icculus-0.16.1.ebuild 4528
+MD5 bef14faabaf74caa6f6667cce1a6e17c ChangeLog 2621
+MD5 5235ed0f8ad58ad577f871c80b33d67b quake2-icculus-0.16.1.ebuild 4666
 MD5 4b84093c6bccf958d3ca1b865c3f9402 files/quake2.xpm 1234
 MD5 c5a30b68d4f251a28b005d64f9d52482 files/0.16-gentoo-path.patch 3493
 MD5 74cb73011282b923820f35f8450ba583 files/README-postinstall 3083
 MD5 799bccbb58711b8831aeaeaa3142b965 files/digest-quake2-icculus-0.16.1 250
 MD5 183390437d587db8cb815bfc1ac2ecbb files/0.16-Makefile-gentoo-opts.patch 249
 MD5 a9abc17ddbcfc3e70d9b57276eaccfba files/0.16-rogue-nan.patch 242
+MD5 2df7805117c32223db23d0ae9c61881e files/quake2-icculus-0.16.1-amd64.patch 534
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
new file mode 100644
index 000000000000..b3291827996c
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
@@ -0,0 +1,18 @@
+The default video renderers (softx / soft) currently do not work 
+on amd64.  So for now we add a little hack which will select the 
+glx renderer by default.
+
+http://bugs.gentoo.org/show_bug.cgi?id=86552
+
+--- src/linux/vid_so.c
++++ src/linux/vid_so.c
+@@ -435,6 +440,9 @@ VID_Init
+ */
+ void VID_Init (void)
+ {
++#if defined __x86_64__
++	vid_ref = Cvar_Get ("vid_ref", "glx", CVAR_ARCHIVE);
++#endif
+ 	/* Create the video variables so we know how to start the graphics drivers */
+ 	// if DISPLAY is defined, try X
+ 	if (getenv("DISPLAY"))
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
index 80efbf21006c..28512af55112 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.3 2005/04/29 02:32:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.4 2005/04/30 06:14:20 vapier Exp $
 
 inherit eutils games
 
@@ -34,6 +34,8 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd "${S}"
+	sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile
+	epatch "${FILESDIR}"/${P}-amd64.patch # make sure this is still needed in future versions
 	epatch "${FILESDIR}"/0.16-Makefile-gentoo-opts.patch
 	epatch "${FILESDIR}"/0.16-gentoo-path.patch
 	cat << EOF > src/linux/gentoo-paths.h