Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-fps/quake2-icculus/files: quake2-icculus-0.16.1-x11_soft.patch
Date: Sun, 01 Apr 2012 20:04:56
Message-Id: 20120401200447.235802004C@flycatcher.gentoo.org
1 tupone 12/04/01 20:04:47
2
3 Added: quake2-icculus-0.16.1-x11_soft.patch
4 Log:
5 Enable software rasterizer on amd64. From bug #358955
6
7 (Portage version: 2.1.10.52/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch?rev=1.1&content-type=text/plain
14
15 Index: quake2-icculus-0.16.1-x11_soft.patch
16 ===================================================================
17
18 the x11 software renderer just needs some tweaks to get working
19
20 --- Makefile.old
21 +++ Makefile
22 @@ -358,7 +358,7 @@
23 endif
24
25 ifeq ($(strip $(BUILD_X11)),YES)
26 - $(warning Warning: Software X Renderer not supported for $(ARCH))
27 + TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
28 endif
29
30 ifeq ($(strip $(BUILD_GLX)),YES)
31 --- src/linux/rw_x11.c.old
32 +++ src/linux/rw_x11.c
33 @@ -53,7 +53,7 @@
34 #include <X11/Xatom.h>
35 #include <X11/keysym.h>
36 #include <X11/extensions/XShm.h>
37 -#include <X11/extensions/xf86dga.h>
38 +#include <X11/extensions/Xxf86dga.h>
39 #ifdef OPENGL
40 #include <X11/extensions/xf86vmode.h>
41 #endif
42 @@ -151,7 +151,7 @@
43 int config_notify_height;
44
45 typedef unsigned short PIXEL16;
46 -typedef unsigned long PIXEL24;
47 +typedef unsigned int PIXEL24;
48 #ifdef REDBLUE
49 static PIXEL16 st2d_8to16table_s[2][256];
50 static PIXEL24 st2d_8to24table_s[2][256];
51 --- src/ref_soft/r_poly.c.old
52 +++ src/ref_soft/r_poly.c
53 @@ -994,7 +994,7 @@
54 scale = yscale * pout->zi;
55 pout->v = (ycenter - scale * transformed[1]);
56
57 - pv += sizeof (vec5_t) / sizeof (pv);
58 + pv += sizeof (vec5_t) / sizeof (float);
59 }
60
61 // draw it