public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Christian Schmitt" <chris@ilovelinux.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
Date: Wed,  1 Jun 2011 16:45:49 +0000 (UTC)	[thread overview]
Message-ID: <7f6570d647b83b2d399376a8ed231c52095fb8e2.christian@gentoo> (raw)

commit:     7f6570d647b83b2d399376a8ed231c52095fb8e2
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Wed Jun  1 16:22:46 2011 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Wed Jun  1 16:22:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=7f6570d6

[games-util/terragear-cs] remove bogus patch

---
 .../files/terragear-cs-setrlimit.patch             |   36 --------------------
 games-util/terragear-cs/terragear-cs-9999.ebuild   |    1 -
 2 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch b/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
deleted file mode 100644
index bcb166c..0000000
--- a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/BuildTiles/Main/main.cxx.orig	2009-06-16 16:31:43.000000000 +0200
-+++ src/BuildTiles/Main/main.cxx	2009-06-16 16:33:43.000000000 +0200
-@@ -1197,12 +1197,12 @@
-     // 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;
-+    limit.rlim_cur = 80000000; //rkj doubled value
-+    limit.rlim_max = 80000000; //rkj doubled value
- 
--#if 0
-     result = setrlimit( RLIMIT_DATA, &limit );
-     cout << "result of setting mem limit = " << result << endl;
-     result = setrlimit( RLIMIT_STACK, &limit );
-@@ -1211,14 +1211,14 @@
-     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.
--    limit.rlim_cur = 300;	// seconds
--    limit.rlim_max = 300;	// seconds
-+    limit.rlim_cur = 600;      // seconds rkj doubled value
-+    limit.rlim_max = 600;      // seconds rkj doubled value
-     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 9657e07..4a4f569 100644
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
@@ -25,7 +25,6 @@ DEPEND="dev-games/simgear
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch ${FILESDIR}/"${PN}"-setrlimit.patch
 	epatch ${FILESDIR}/"${PN}"-use-agg.patch
 	eautoreconf
 }



             reply	other threads:[~2011-06-01 16:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-01 16:45 Christian Schmitt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-06-02  7:59 [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/ Christian Schmitt
2011-08-29 22:51 Christian Schmitt
2011-09-28 23:17 Christian Schmitt
2011-10-24  9:57 Christian Schmitt
2011-11-08 11:28 Christian Schmitt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7f6570d647b83b2d399376a8ed231c52095fb8e2.christian@gentoo \
    --to=chris@ilovelinux.de \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox