summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Schmitt <chris@ilovelinux.de>2011-06-02 09:51:44 +0200
committerChristian Schmitt <chris@ilovelinux.de>2011-06-02 09:58:57 +0200
commitb69f495805f2091dba11763c90751028ada44e8b (patch)
tree88b86e9981431ae6ac8a24ed39f0acd89b9a425e
parent[games-util/terragear-cs] remove bogus patch (diff)
downloadgamerlay-b69f495805f2091dba11763c90751028ada44e8b.tar.gz
gamerlay-b69f495805f2091dba11763c90751028ada44e8b.tar.bz2
gamerlay-b69f495805f2091dba11763c90751028ada44e8b.zip
[games-util/terragear-cs] new "remove limits" patch
-rw-r--r--games-util/terragear-cs/Manifest3
-rw-r--r--games-util/terragear-cs/files/terragear-cs-setrlimit.patch34
-rw-r--r--games-util/terragear-cs/terragear-cs-9999.ebuild1
3 files changed, 37 insertions, 1 deletions
diff --git a/games-util/terragear-cs/Manifest b/games-util/terragear-cs/Manifest
index c40cb49..049acaf 100644
--- a/games-util/terragear-cs/Manifest
+++ b/games-util/terragear-cs/Manifest
@@ -1,3 +1,4 @@
+AUX terragear-cs-setrlimit.patch 1354 RMD160 8d0a56cd8a98f5ab8eefc35edcf27669cf5a8fdf SHA1 c10e61ca9450ccab4d985330157d5bfc3f0c2750 SHA256 d8b00553c08b04c73a322860130e2030e22b60b26313f036ebab19605676427f
AUX terragear-cs-use-agg.patch 5557 RMD160 b1070af53fa8427d87cc6b8dc7df473cc5a1fb38 SHA1 3a6b297968c0f7cb1df9f5faf21ed499706710df SHA256 5b019c12e41ca7ab0d0c1bc8adeefe5839f49027aef6d7d103be0c9c4718af4b
-EBUILD terragear-cs-9999.ebuild 665 RMD160 395fd4ee4aeb0364781c8c175910e890bd57ca1a SHA1 4de749d0250557fef77a035c7348b1cb56eb7eb2 SHA256 a09164cfbb28f4fb12cf5783f553d4f6ee60ea37d79035c64a87cae5bcde70b8
+EBUILD terragear-cs-9999.ebuild 709 RMD160 e53490c15705647fa53e0f4709de2e9a4d67d561 SHA1 70bd3115bc799a2e5883c9d1988f12c46662f8bc SHA256 e667680cf559ff04640ebd9e69c410559afde8219118f01c234e559acedb169b
MISC metadata.xml 309 RMD160 3b2c61243b818b3b53932f26899e00bd192cfbb4 SHA1 0419836318eb7c961fcf0063ae4dbef259b750f1 SHA256 2c1cb442256717e7a928002fb32e7167f8e991e6b42b2b85ec15f699d3041eac
diff --git a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch b/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
new file mode 100644
index 0000000..42561a9
--- /dev/null
+++ b/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
@@ -0,0 +1,34 @@
+diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx
+index f666187..f4c0579 100644
+--- a/src/BuildTiles/Main/main.cxx
++++ b/src/BuildTiles/Main/main.cxx
+@@ -1166,12 +1166,12 @@ int main(int argc, char **argv) {
+ // routine can blow up and allocate memory forever. We'd like
+ // this process to die before things get out of hand so we can try
+ // again with a smaller interior angle limit.
++#if 0
+ int result;
+ struct rlimit limit;
+ limit.rlim_cur = 40000000;
+ limit.rlim_max = 40000000;
+
+-#if 0
+ result = setrlimit( RLIMIT_DATA, &limit );
+ cout << "result of setting mem limit = " << result << endl;
+ result = setrlimit( RLIMIT_STACK, &limit );
+@@ -1180,7 +1180,6 @@ int main(int argc, char **argv) {
+ cout << "result of setting mem limit = " << result << endl;
+ result = setrlimit( RLIMIT_RSS, &limit );
+ cout << "result of setting mem limit = " << result << endl;
+-#endif
+
+ // cpu time limit since occassionally the triangulator can go into
+ // an infinite loop.
+@@ -1188,6 +1187,7 @@ int main(int argc, char **argv) {
+ limit.rlim_max = 300; // seconds
+ result = setrlimit( RLIMIT_CPU, &limit );
+ cout << "result of setting mem limit = " << result << endl;
++#endif
+ #endif // end of stuff that crashes Cygwin
+
+ // main construction data management class
diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index 4a4f569..9657e07 100644
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="dev-games/simgear
RDEPEND="${DEPEND}"
src_prepare() {
+ epatch ${FILESDIR}/"${PN}"-setrlimit.patch
epatch ${FILESDIR}/"${PN}"-use-agg.patch
eautoreconf
}