Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/btanks/files: btanks-0.8.7686-scons-blows.patch
Date: Fri, 23 Jan 2009 07:26:21
Message-Id: E1LQGQj-0007jw-QP@stork.gentoo.org
1 mr_bones_ 09/01/23 07:26:17
2
3 Modified: btanks-0.8.7686-scons-blows.patch
4 Log:
5 EAPI=2; add use-based deps; allow parallel build; re-roll patch to avoid passing CFLAGS to the c++ compiler; fixed some compile warnings; work around namespace collision for bug #237980
6 (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)
7
8 Revision Changes Path
9 1.2 games-action/btanks/files/btanks-0.8.7686-scons-blows.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7686-scons-blows.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7686-scons-blows.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/btanks/files/btanks-0.8.7686-scons-blows.patch?r1=1.1&r2=1.2
14
15 Index: btanks-0.8.7686-scons-blows.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-action/btanks/files/btanks-0.8.7686-scons-blows.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- btanks-0.8.7686-scons-blows.patch 12 Sep 2008 14:38:59 -0000 1.1
22 +++ btanks-0.8.7686-scons-blows.patch 23 Jan 2009 07:26:17 -0000 1.2
23 @@ -1,5 +1,15 @@
24 ---- SConstruct
25 -+++ SConstruct
26 +diff -ru btanks-0.8.7686.orig/SConstruct btanks-0.8.7686/SConstruct
27 +--- btanks-0.8.7686.orig/SConstruct 2008-07-29 05:08:59.000000000 -0400
28 ++++ btanks-0.8.7686/SConstruct 2009-01-23 02:15:29.000000000 -0500
29 +@@ -49,7 +49,7 @@
30 + if os.environ.has_key('CC'):
31 + env['CC'] = os.environ['CC']
32 + if os.environ.has_key('CFLAGS'):
33 +- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
34 ++ env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
35 + if os.environ.has_key('CXX'):
36 + env['CXX'] = os.environ['CXX']
37 + if os.environ.has_key('CXXFLAGS'):
38 @@ -90,19 +90,9 @@
39 #env.Append(CPPDEFINES = ['NDEBUG'])
40
41 @@ -22,3 +32,112 @@
42
43
44 conf_env = env.Clone()
45 +diff -ru btanks-0.8.7686.orig/clunk/kiss/_kiss_fft_guts.h btanks-0.8.7686/clunk/kiss/_kiss_fft_guts.h
46 +--- btanks-0.8.7686.orig/clunk/kiss/_kiss_fft_guts.h 2008-03-12 06:32:16.000000000 -0400
47 ++++ btanks-0.8.7686/clunk/kiss/_kiss_fft_guts.h 2009-01-23 02:16:13.000000000 -0500
48 +@@ -18,6 +18,7 @@
49 + typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
50 + #include "kiss_fft.h"
51 + #include <limits.h>
52 ++#include <string.h>
53 +
54 + #define MAXFACTORS 32
55 + /* e.g. an fft of length 128 has 4 factors
56 +diff -ru btanks-0.8.7686.orig/mrt/export_base.h btanks-0.8.7686/mrt/export_base.h
57 +--- btanks-0.8.7686.orig/mrt/export_base.h 2008-01-09 06:14:14.000000000 -0500
58 ++++ btanks-0.8.7686/mrt/export_base.h 2009-01-23 02:16:58.000000000 -0500
59 +@@ -1,7 +1,7 @@
60 + #ifndef MRT_EXPORT_MACRO_H__
61 + #define MRT_EXPORT_MACRO_H__
62 +
63 +-// Shared library support
64 ++/* Shared library support */
65 + #ifdef _WINDOWS
66 +
67 + # pragma warning(disable:4251) /* needs to have dll-interface used by client */
68 +diff -ru btanks-0.8.7686.orig/mrt/tclUniData.c btanks-0.8.7686/mrt/tclUniData.c
69 +--- btanks-0.8.7686.orig/mrt/tclUniData.c 2008-08-15 03:44:45.000000000 -0400
70 ++++ btanks-0.8.7686/mrt/tclUniData.c 2009-01-23 02:15:29.000000000 -0500
71 +@@ -880,7 +880,7 @@
72 + FINAL_QUOTE_PUNCTUATION,
73 + OTHER_PUNCTUATION,
74 + MATH_SYMBOL,
75 +- CURRENCY_SYMBOL,
76 ++ LCURRENCY_SYMBOL,
77 + MODIFIER_SYMBOL,
78 + OTHER_SYMBOL
79 + };
80 +diff -ru btanks-0.8.7686.orig/sdlx/gfx/SDL_rotozoom.c btanks-0.8.7686/sdlx/gfx/SDL_rotozoom.c
81 +--- btanks-0.8.7686.orig/sdlx/gfx/SDL_rotozoom.c 2008-09-02 06:43:34.000000000 -0400
82 ++++ btanks-0.8.7686/sdlx/gfx/SDL_rotozoom.c 2009-01-23 02:18:37.000000000 -0500
83 +@@ -153,7 +153,7 @@
84 + * Advance destination pointer
85 + */
86 + dp++;
87 +- } // dst x loop
88 ++ } /* dst x loop */
89 +
90 + /* next box-y */
91 + sp = (Uint8 *)((Uint8*)osp + src->pitch*factory);
92 +@@ -739,7 +739,7 @@
93 + }
94 + break;
95 +
96 +- case 2: // rotated 180 degrees clockwise
97 ++ case 2: /* rotated 180 degrees clockwise */
98 + {
99 + Uint32* srcBuf = NULL;
100 + Uint32* dstBuf = NULL;
101 +@@ -751,8 +751,8 @@
102 + *dstBuf = *srcBuf;
103 + ++srcBuf;
104 + --dstBuf;
105 +- } // for(col)
106 +- } // for(row)
107 ++ }
108 ++ }
109 + }
110 + break;
111 +
112 +@@ -768,17 +768,16 @@
113 + *dstBuf = *srcBuf;
114 + ++srcBuf;
115 + dstBuf -= pSurfOut->pitch/4;
116 +- } // for(col)
117 +- } // for(row)
118 ++ }
119 ++ }
120 + }
121 + break;
122 +- } // switch
123 ++ }
124 +
125 + SDL_UnlockSurface(pSurf);
126 + SDL_UnlockSurface(pSurfOut);
127 +- } // if numClockwiseTurns > 0
128 ++ }
129 + else {
130 +- // simply copy surface to output
131 + if(SDL_BlitSurface(pSurf, NULL, pSurfOut, NULL)) {
132 + return NULL;
133 + }
134 +diff -ru btanks-0.8.7686.orig/sdlx/wrappers/glSDL.c btanks-0.8.7686/sdlx/wrappers/glSDL.c
135 +--- btanks-0.8.7686.orig/sdlx/wrappers/glSDL.c 2008-05-29 05:54:00.000000000 -0400
136 ++++ btanks-0.8.7686/sdlx/wrappers/glSDL.c 2009-01-23 02:17:48.000000000 -0500
137 +@@ -11,8 +11,6 @@
138 +
139 + #ifdef HAVE_OPENGL
140 +
141 +-//#define LEAK_TRACKING
142 +-
143 + #define DBG(x) /*error messages, warnings*/
144 + #define DBG2(x) /*texture allocation*/
145 + #define DBG3(x) /*chopping/tiling*/
146 +@@ -951,7 +949,6 @@
147 + }
148 + gl_doublebuf = flags & SDL_DOUBLEBUF;
149 + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf);
150 +- //SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0);
151 +
152 + scale = 1;
153 +
Report Message
Find on MARC Find on Google Groups