* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-06-01 16:45 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-06-01 16:45 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-06-02 7:59 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-06-02 7:59 UTC (permalink / raw
To: gentoo-commits
commit: b69f495805f2091dba11763c90751028ada44e8b
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Thu Jun 2 07:51:44 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Thu Jun 2 07:58:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=b69f4958
[games-util/terragear-cs] new "remove limits" patch
---
.../files/terragear-cs-setrlimit.patch | 34 ++++++++++++++++++++
games-util/terragear-cs/terragear-cs-9999.ebuild | 1 +
2 files changed, 35 insertions(+), 0 deletions(-)
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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-08-29 22:51 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-08-29 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 9d558699e040fb95a5f88c8d7e28794b57a40f91
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Aug 29 22:29:35 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Mon Aug 29 22:29:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=9d558699
[games-util/terragear-cs] add parallel make patch
---
.../files/terragear-cs-fix-parallel-build.patch | 45 ++++++++++++++++++++
games-util/terragear-cs/terragear-cs-9999.ebuild | 5 +--
2 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch b/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
new file mode 100644
index 0000000..7a2438a
--- /dev/null
+++ b/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
@@ -0,0 +1,45 @@
+diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am
+index 6557c98..eba2694 100644
+--- a/src/BuildTiles/Clipper/Makefile.am
++++ b/src/BuildTiles/Clipper/Makefile.am
+@@ -5,9 +5,7 @@ dist_pkgdata_DATA = default_priorities.txt
+ noinst_PROGRAMS = testclipper
+
+ testclipper_SOURCES = testclipper.cxx
+-
+-testclipper_LDADD = \
+- $(top_builddir)/src/BuildTiles/Clipper/libClipper.a \
++testclipper_LDADD = libClipper.a \
+ $(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \
+ $(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \
+ $(top_builddir)/src/Lib/Polygon/libPolygon.a \
+diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am
+index 10636d5..acb41db 100644
+--- a/src/Lib/Array/Makefile.am
++++ b/src/Lib/Array/Makefile.am
+@@ -6,9 +6,7 @@ libArray_a_SOURCES = array.cxx array.hxx
+ bin_PROGRAMS = testarray
+
+ testarray_SOURCES = testarray.cxx
+-
+-testarray_LDADD = \
+- $(top_builddir)/src/Lib/Array/libArray.a \
++testarray_LDADD = libArray.a \
+ -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml \
+ $(support_LIBS) -lz
+
+diff --git a/src/Lib/HGT/Makefile.am b/src/Lib/HGT/Makefile.am
+index b4ee8cb..16809aa 100644
+--- a/src/Lib/HGT/Makefile.am
++++ b/src/Lib/HGT/Makefile.am
+@@ -5,9 +5,7 @@ libHGT_a_SOURCES = hgt.cxx hgt.hxx srtmbase.cxx srtmbase.hxx
+ noinst_PROGRAMS = testhgt
+
+ testhgt_SOURCES = testhgt.cxx
+-
+-testhgt_LDADD = \
+- $(top_builddir)/src/Lib/HGT/libHGT.a \
++testhgt_LDADD = libHGT.a \
+ -lsgbucket -lsgmisc -lsgdebug -lz -lplibul
+
+ INCLUDES = -I$(top_srcdir)/src
diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index 9657e07..79c124a 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}"-fix-parallel-build.patch
epatch ${FILESDIR}/"${PN}"-setrlimit.patch
epatch ${FILESDIR}/"${PN}"-use-agg.patch
eautoreconf
@@ -33,7 +34,3 @@ src_prepare() {
src_configure() {
econf $(use_with gdal)
}
-
-src_compile() {
- emake -j1
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-09-28 23:17 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-09-28 23:17 UTC (permalink / raw
To: gentoo-commits
commit: f3e0f6b5e25c105883519fed4d701329201d0dc4
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Wed Sep 28 23:16:45 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Wed Sep 28 23:17:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f3e0f6b5
[games-util/terragear-cs] parallel build patch is now upstream
---
.../files/terragear-cs-fix-parallel-build.patch | 45 --------------------
games-util/terragear-cs/terragear-cs-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch b/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
deleted file mode 100644
index 7a2438a..0000000
--- a/games-util/terragear-cs/files/terragear-cs-fix-parallel-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/BuildTiles/Clipper/Makefile.am b/src/BuildTiles/Clipper/Makefile.am
-index 6557c98..eba2694 100644
---- a/src/BuildTiles/Clipper/Makefile.am
-+++ b/src/BuildTiles/Clipper/Makefile.am
-@@ -5,9 +5,7 @@ dist_pkgdata_DATA = default_priorities.txt
- noinst_PROGRAMS = testclipper
-
- testclipper_SOURCES = testclipper.cxx
--
--testclipper_LDADD = \
-- $(top_builddir)/src/BuildTiles/Clipper/libClipper.a \
-+testclipper_LDADD = libClipper.a \
- $(top_builddir)/src/BuildTiles/Osgb36/libOsgb36.a \
- $(top_builddir)/src/BuildTiles/Triangulate/libTriangulate.a \
- $(top_builddir)/src/Lib/Polygon/libPolygon.a \
-diff --git a/src/Lib/Array/Makefile.am b/src/Lib/Array/Makefile.am
-index 10636d5..acb41db 100644
---- a/src/Lib/Array/Makefile.am
-+++ b/src/Lib/Array/Makefile.am
-@@ -6,9 +6,7 @@ libArray_a_SOURCES = array.cxx array.hxx
- bin_PROGRAMS = testarray
-
- testarray_SOURCES = testarray.cxx
--
--testarray_LDADD = \
-- $(top_builddir)/src/Lib/Array/libArray.a \
-+testarray_LDADD = libArray.a \
- -lsgbucket -lsgmath -lsgmisc -lsgdebug -lsgxml \
- $(support_LIBS) -lz
-
-diff --git a/src/Lib/HGT/Makefile.am b/src/Lib/HGT/Makefile.am
-index b4ee8cb..16809aa 100644
---- a/src/Lib/HGT/Makefile.am
-+++ b/src/Lib/HGT/Makefile.am
-@@ -5,9 +5,7 @@ libHGT_a_SOURCES = hgt.cxx hgt.hxx srtmbase.cxx srtmbase.hxx
- noinst_PROGRAMS = testhgt
-
- testhgt_SOURCES = testhgt.cxx
--
--testhgt_LDADD = \
-- $(top_builddir)/src/Lib/HGT/libHGT.a \
-+testhgt_LDADD = libHGT.a \
- -lsgbucket -lsgmisc -lsgdebug -lz -lplibul
-
- INCLUDES = -I$(top_srcdir)/src
diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index 521b8be..c318b67 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-cs
RDEPEND="${DEPEND}"
src_prepare() {
- epatch ${FILESDIR}/"${PN}"-fix-parallel-build.patch
epatch ${FILESDIR}/"${PN}"-setrlimit.patch
epatch ${FILESDIR}/"${PN}"-use-agg.patch
eautoreconf
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-10-24 9:57 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-10-24 9:57 UTC (permalink / raw
To: gentoo-commits
commit: eb9be33dc986714092616b57e6e348e309e2f975
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Oct 24 09:55:53 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Mon Oct 24 09:57:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=eb9be33d
[games-util/terragear-cs] one patch less necessary
---
.../files/terragear-cs-setrlimit.patch | 34 --------------------
games-util/terragear-cs/terragear-cs-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 35 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 42561a9..0000000
--- a/games-util/terragear-cs/files/terragear-cs-setrlimit.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 46d6868..c560da4 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/
@ 2011-11-08 11:28 Christian Schmitt
0 siblings, 0 replies; 6+ messages in thread
From: Christian Schmitt @ 2011-11-08 11:28 UTC (permalink / raw
To: gentoo-commits
commit: e299dc22a865ef1f81df053467aaa49990fa24d9
Author: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Tue Nov 8 11:26:40 2011 +0000
Commit: Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Tue Nov 8 11:28:42 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=e299dc22
[games-util/terragear-cs] move to cmake. Lots of improvements upstream.
---
.../terragear-cs/files/terragear-cs-use-agg.patch | 134 --------------------
games-util/terragear-cs/terragear-cs-9999.ebuild | 14 ++-
2 files changed, 8 insertions(+), 140 deletions(-)
diff --git a/games-util/terragear-cs/files/terragear-cs-use-agg.patch b/games-util/terragear-cs/files/terragear-cs-use-agg.patch
deleted file mode 100644
index aa6bf1d..0000000
--- a/games-util/terragear-cs/files/terragear-cs-use-agg.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -ru src/Airports/GenAirports/Makefile.am src/Airports/GenAirports/Makefile.am
---- src/Airports/GenAirports/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Airports/GenAirports/Makefile.am 2010-07-15 10:05:48.000000000 +0200
-@@ -52,7 +52,7 @@
- $(top_builddir)/src/Lib/Output/libOutput.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip \
-+ -lagggpc \
- -lnewmat \
- -lz \
- $(base_LIBS)
-diff -ru src/BuildTiles/Clipper/Makefile.am src/BuildTiles/Clipper/Makefile.am
---- src/BuildTiles/Clipper/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/BuildTiles/Clipper/Makefile.am 2010-07-15 10:05:48.000000000 +0200
-@@ -16,7 +16,7 @@
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgbucket -lsgdebug -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib -I$(top_srcdir)/src/BuildTiles
-
-diff -ru src/BuildTiles/Main/Makefile.am src/BuildTiles/Main/Makefile.am
---- src/BuildTiles/Main/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/BuildTiles/Main/Makefile.am 2010-07-15 10:05:48.000000000 +0200
-@@ -21,7 +21,7 @@
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgbucket -lsgio -lsgmath -lsgmisc -lsgdebug -lsgstructure -lsgxml \
-- -lplibsg -lplibul -lgenpolyclip -lz
-+ -lplibsg -lplibul -lagggpc -lz
-
- fgfs_master_SOURCES = master.cxx
-
-diff -ru src/Prep/E00Lines/Makefile.am src/Prep/E00Lines/Makefile.am
---- src/Prep/E00Lines/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/E00Lines/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -10,6 +10,6 @@
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- $(top_builddir)/src/Lib/e00/libe00.a \
- -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/GSHHS/Makefile.am src/Prep/GSHHS/Makefile.am
---- src/Prep/GSHHS/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/GSHHS/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -11,7 +11,7 @@
- $(top_builddir)/src/Lib/Output/libOutput.a \
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- debug_SOURCES = \
- debug.cxx
-@@ -21,6 +21,6 @@
- $(top_builddir)/src/Lib/Geometry/libGeometry.a \
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/MergerClipper/Makefile.am src/Prep/MergerClipper/Makefile.am
---- src/Prep/MergerClipper/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/MergerClipper/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -13,6 +13,6 @@
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/OGRDecode/Makefile.am src/Prep/OGRDecode/Makefile.am
---- src/Prep/OGRDecode/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/OGRDecode/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -11,6 +11,6 @@
- $(top_builddir)/src/Lib/poly2tri/libpoly2tri.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/Photo/Makefile.am src/Prep/Photo/Makefile.am
---- src/Prep/Photo/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/Photo/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -37,7 +37,7 @@
- $(top_builddir)/src/Lib/Output/libOutput.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
- $(base_LIBS)
-
- wgs84offset_SOURCES = wgs84offset.cxx
-diff -ru src/Prep/ShapeFile/Makefile.am src/Prep/ShapeFile/Makefile.am
---- src/Prep/ShapeFile/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/ShapeFile/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -12,6 +12,6 @@
- $(top_builddir)/src/Lib/shapelib/libshape.a \
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- -lsgdebug -lsgbucket -lsgmath -lsgmisc -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/TGVPF/Makefile.am src/Prep/TGVPF/Makefile.am
---- src/Prep/TGVPF/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/TGVPF/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -10,6 +10,6 @@
- $(top_builddir)/src/Lib/TriangleJRS/libTriangleJRS.a \
- $(top_builddir)/src/Lib/vpf/libvpf.a \
- -lsgdebug -lsgbucket -lsgmisc -lsgmath -lsgio -lsgtiming -lsgstructure -lsgxml \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
-diff -ru src/Prep/UserDef/Makefile.am src/Prep/UserDef/Makefile.am
---- src/Prep/UserDef/Makefile.am 2010-07-15 10:04:49.000000000 +0200
-+++ src/Prep/UserDef/Makefile.am 2010-07-15 10:05:47.000000000 +0200
-@@ -11,6 +11,6 @@
- -lsgbucket -lsgmisc -lsgmath -lsgprops -lsgio -lsgstructure -lsgxml \
- -lsgdebug \
- -lOpenThreads \
-- -lgenpolyclip -lz
-+ -lagggpc -lz
-
- INCLUDES = -I$(top_srcdir)/src/Lib
diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index c560da4..2d011fd 100644
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-inherit autotools git-2
+inherit cmake-utils git-2
DESCRIPTION="Terrain editing programs for FlightGear"
HOMEPAGE="http://terragear.sourceforge.net/"
@@ -16,8 +16,8 @@ KEYWORDS=""
IUSE="gdal"
DEPEND="dev-games/simgear
+ dev-libs/boost
dev-libs/newmat
- media-libs/plib
|| ( =x11-libs/agg-2.5 >x11-libs/agg-2.5[gpc] )
gdal? ( sci-libs/gdal )
"
@@ -25,11 +25,13 @@ DEPEND="dev-games/simgear
RDEPEND="${DEPEND}"
src_prepare() {
- epatch ${FILESDIR}/"${PN}"-use-agg.patch
- eautoreconf
+ sed -e "s|genpolyclip|agggpc|g" -i CMakeModules/FindGPC.cmake
}
src_configure() {
- econf \
- $(use_with gdal)
+ mycmakeargs=(
+ $(cmake-utils_use_enable gdal)
+ )
+
+ cmake-utils_src_configure
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-08 11:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-29 22:51 [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/ Christian Schmitt
-- strict thread matches above, loose matches on Subject: below --
2011-11-08 11:28 Christian Schmitt
2011-10-24 9:57 Christian Schmitt
2011-09-28 23:17 Christian Schmitt
2011-06-02 7:59 Christian Schmitt
2011-06-01 16:45 Christian Schmitt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox