Gentoo Archives: gentoo-commits

From: Christian Schmitt <chris@××××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
Date: Wed, 01 Jun 2011 16:46:01
Message-Id: 7f6570d647b83b2d399376a8ed231c52095fb8e2.christian@gentoo
1 commit: 7f6570d647b83b2d399376a8ed231c52095fb8e2
2 Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
3 AuthorDate: Wed Jun 1 16:22:46 2011 +0000
4 Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
5 CommitDate: Wed Jun 1 16:22:46 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=7f6570d6
7
8 [games-util/terragear-cs] remove bogus patch
9
10 ---
11 .../files/terragear-cs-setrlimit.patch | 36 --------------------
12 games-util/terragear-cs/terragear-cs-9999.ebuild | 1 -
13 2 files changed, 0 insertions(+), 37 deletions(-)
14
15 diff --git a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch b/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
16 deleted file mode 100644
17 index bcb166c..0000000
18 --- a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
19 +++ /dev/null
20 @@ -1,36 +0,0 @@
21 ---- src/BuildTiles/Main/main.cxx.orig 2009-06-16 16:31:43.000000000 +0200
22 -+++ src/BuildTiles/Main/main.cxx 2009-06-16 16:33:43.000000000 +0200
23 -@@ -1197,12 +1197,12 @@
24 - // routine can blow up and allocate memory forever. We'd like
25 - // this process to die before things get out of hand so we can try
26 - // again with a smaller interior angle limit.
27 -+ #if 0
28 - int result;
29 - struct rlimit limit;
30 -- limit.rlim_cur = 40000000;
31 -- limit.rlim_max = 40000000;
32 -+ limit.rlim_cur = 80000000; //rkj doubled value
33 -+ limit.rlim_max = 80000000; //rkj doubled value
34 -
35 --#if 0
36 - result = setrlimit( RLIMIT_DATA, &limit );
37 - cout << "result of setting mem limit = " << result << endl;
38 - result = setrlimit( RLIMIT_STACK, &limit );
39 -@@ -1211,14 +1211,14 @@
40 - cout << "result of setting mem limit = " << result << endl;
41 - result = setrlimit( RLIMIT_RSS, &limit );
42 - cout << "result of setting mem limit = " << result << endl;
43 --#endif
44 -
45 - // cpu time limit since occassionally the triangulator can go into
46 - // an infinite loop.
47 -- limit.rlim_cur = 300; // seconds
48 -- limit.rlim_max = 300; // seconds
49 -+ limit.rlim_cur = 600; // seconds rkj doubled value
50 -+ limit.rlim_max = 600; // seconds rkj doubled value
51 - result = setrlimit( RLIMIT_CPU, &limit );
52 - cout << "result of setting mem limit = " << result << endl;
53 -+#endif
54 - #endif // end of stuff that crashes Cygwin
55 -
56 - // main construction data management class
57
58 diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
59 index 9657e07..4a4f569 100644
60 --- a/games-util/terragear-cs/terragear-cs-9999.ebuild
61 +++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
62 @@ -25,7 +25,6 @@ DEPEND="dev-games/simgear
63 RDEPEND="${DEPEND}"
64
65 src_prepare() {
66 - epatch ${FILESDIR}/"${PN}"-setrlimit.patch
67 epatch ${FILESDIR}/"${PN}"-use-agg.patch
68 eautoreconf
69 }