Enable software rasterizer on amd64. From bug #358955

Package-Manager: portage-2.1.10.52/cvs/Linux i686

4 files changed, 58 insertions, 7 deletions

diff --git a/games-fps/quake2-icculus/ChangeLog b/games-fps/quake2-icculus/ChangeLog
index b03d012f7586..f1dbe3f0f144 100644
--- a/games-fps/quake2-icculus/ChangeLog
+++ b/games-fps/quake2-icculus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake2-icculus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.44 2012/04/01 17:08:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/ChangeLog,v 1.45 2012/04/01 20:04:46 tupone Exp $
+
+  01 Apr 2012; Tupone Alfredo <tupone@gentoo.org>
+  quake2-icculus-0.16.1-r1.ebuild, +files/quake2-icculus-0.16.1-x11_soft.patch:
+  Enable software rasterizer on amd64. From bug #358955 by ocrbj
 
   01 Apr 2012; Tupone Alfredo <tupone@gentoo.org>
   quake2-icculus-0.16.1-r1.ebuild,
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 31bf7cea1de7..8e69af42b432 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -11,18 +11,19 @@ AUX quake2-icculus-0.16.1-gentoo-paths.patch 7688 RMD160 db521205c1d787fb31262d1
 AUX quake2-icculus-0.16.1-gnusource.patch 482 RMD160 69b4320654bc483d9aa5794623506c66ae95aa5d SHA1 8dbad22fd9b135202feb109a3aed4cfcfc95eba8 SHA256 9ac34f2bebbb6d4a19c590e00db8e5b0034b3ffe2a245a595e28ab43d65d7617
 AUX quake2-icculus-0.16.1-ldflags.patch 1609 RMD160 3ac08c24bb2f32c3067f2a1e10b9ddb16b896ea2 SHA1 f634ef0807934341562041778a7281e2616e09fd SHA256 b161ab85ab2fd8a4bf5b20e8ac9a80429f735eb1bae611b79b92677f04eacc42
 AUX quake2-icculus-0.16.1-no-asm-io.patch 513 RMD160 0ae685e8f5d02511013b6f5b9106e11c024cc2a9 SHA1 53651b2175b9e547e8f01215bf9e6f94f3cee539 SHA256 05a648b32ce0c260046706ee2f4c6f49a0e7049ed07cd02fd895f6fd83556012
+AUX quake2-icculus-0.16.1-x11_soft.patch 1128 RMD160 63c6b10bc3ed6ec79f0c86a1e6bca54b43a3e24c SHA1 964b342989039836398ac742f06ccb2cbf152297 SHA256 dba3c805e599f055ad43656e38c2a67d9288d758a87dc9d092db144a1a6cd0c1
 AUX quake2.xpm 1234 RMD160 4afa56af8446c288b5779cf7e2c0b8dfe98e9bba SHA1 7adcc4c3242ea6468c259d181e9cd251ce1fd570 SHA256 0a5232384c56ccead145345a30e4ed7004bf36fe7656d43c46f1bed34d8fc2a9
 DIST maxpak.pak 3282742 RMD160 6b5223fee63dbb2c886e3c1e39d9e157d65f589f SHA1 ecafe118f20b96c7ba74842839702fde6965d640 SHA256 653569fe880f1ed5f7529483ac961b22078482e6ff0e83f4d9d1bc503c866770
 DIST quake2-r0.16.1.tar.gz 1525384 RMD160 dbbf9cad08ab381e0c2cd037e317104085455c23 SHA1 9226acadc896ddc9924c6b7f9b71857078af5dba SHA256 49f4d3d53772b6ffd7733506f5d121c7893bfd8884133bfc36a28039c0744642
 DIST roguesrc320.shar.Z 626769 RMD160 767c5b1a7a1123370e9c924282656dfdcc6cebba SHA1 7c5cadde75f5353622552cd28501ce60ac83dca2 SHA256 ceefb2fd748961cb0bc3244220f3eb09d8f7b8ca2eb32cdf9b284727a2fdc919
 DIST xatrixsrc320.shar.Z 455917 RMD160 357182dcd760a95b27942cdf807ba1242bcb1160 SHA1 ec67b6d2be623dd344c100869fc48bcbadea927a SHA256 94bf596cd85d38ea294b99ccb0ebb5e4b9776cca335001b3803e2d8407395589
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5572 RMD160 6d63faf2aa47b9fd13eb70a4ede688f3c13600bb SHA1 d8f28729d44973cd9cfead8d9d5358e1952d7003 SHA256 ef23b69aab3384bebc4f29bc3b9055c451c360481428e7f634ed27e413398249
-MISC ChangeLog 7934 RMD160 d68abfc71afc07b580743c15cdd5a2501575d3da SHA1 599efc0db497c410253d412f9fd2c5f9be7f7d8d SHA256 f043b71434485c017fdd743bd8dd06ce13cb8e4801f989084541732103d5dec2
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5610 RMD160 5b8d8313bd39718a8d4a6be9db73c1ff3c715b26 SHA1 d79ec91bcb357b5ab09f82edbb1c8cf8adf95b2f SHA256 fe485beb3614d6e2b89616ada91f59795e286b74da0347ce533e8af3a7a3566c
+MISC ChangeLog 8130 RMD160 448272647e47b8917f5d69692569eb9b44ce1d48 SHA1 9a26caf885442630e3afb86b8dcb128160344224 SHA256 a1d434b5dc0b4c62649946f15fa915bc2b8ea26ade213ad7f99b1d854e73fff6
 MISC metadata.xml 513 RMD160 1dc52f937a6d3f1e62131171345cd429c4f080cf SHA1 01cfd49cdfd38befba81acae82c76c52edc38b31 SHA256 0608a118c068c5cb15473fc3ee2c6338b6a6330ee2063d1d2b6864c57a761e2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94i4YACgkQIY77eQFFFC0+lACg0vIfWORJKrwP8IVK8q7XUB3N
-7uQAn099W4SuzHjDtiVZJJ/FybqK8SbA
-=JR6J
+iEYEARECAAYFAk94tOQACgkQIY77eQFFFC0qYQCeI62dwOVjZNmmsYfAh7aSqkJK
+GqQAniBXLKjortFRcyOOu6viB5RwhAAA
+=Q3FF
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
new file mode 100644
index 000000000000..e23caf9db09f
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
@@ -0,0 +1,45 @@
+
+the x11 software renderer just needs some tweaks to get working
+
+--- Makefile.old
++++ Makefile
+@@ -358,7 +358,7 @@
+  endif
+ 
+  ifeq ($(strip $(BUILD_X11)),YES)
+-  $(warning Warning: Software X Renderer not supported for $(ARCH))
++  TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
+  endif
+ 
+  ifeq ($(strip $(BUILD_GLX)),YES)
+--- src/linux/rw_x11.c.old
++++ src/linux/rw_x11.c
+@@ -53,7 +53,7 @@
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>
+ #include <X11/extensions/XShm.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+ #ifdef OPENGL
+ #include <X11/extensions/xf86vmode.h>
+ #endif
+@@ -151,7 +151,7 @@
+ int config_notify_height;
+ 						      
+ typedef unsigned short PIXEL16;
+-typedef unsigned long PIXEL24;
++typedef unsigned int PIXEL24;
+ #ifdef REDBLUE
+ static PIXEL16 st2d_8to16table_s[2][256];
+ static PIXEL24 st2d_8to24table_s[2][256];
+--- src/ref_soft/r_poly.c.old
++++ src/ref_soft/r_poly.c
+@@ -994,7 +994,7 @@
+ 		scale = yscale * pout->zi;
+ 		pout->v = (ycenter - scale * transformed[1]);
+ 
+-		pv += sizeof (vec5_t) / sizeof (pv);
++		pv += sizeof (vec5_t) / sizeof (float);
+ 	}
+ 
+ // draw it
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 5663f4cf5ad6..e037424665a9 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-2012 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.25 2012/04/01 17:08:10 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild,v 1.26 2012/04/01 20:04:46 tupone Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -81,6 +81,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-no-asm-io.patch \
 		"${FILESDIR}"/${P}-gnusource.patch \
+		"${FILESDIR}"/${P}-x11_soft.patch \
 		"${FILESDIR}"/${P}-alsa.patch
 
 	if use xatrix ; then