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: Tue, 8 Nov 2011 11:28:51 +0000 (UTC) [thread overview]
Message-ID: <e299dc22a865ef1f81df053467aaa49990fa24d9.christian@gentoo> (raw)
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
}
next reply other threads:[~2011-11-08 11:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-08 11:28 Christian Schmitt [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-24 9:57 [gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/files/, games-util/terragear-cs/ Christian Schmitt
2011-09-28 23:17 Christian Schmitt
2011-08-29 22:51 Christian Schmitt
2011-06-02 7:59 Christian Schmitt
2011-06-01 16:45 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=e299dc22a865ef1f81df053467aaa49990fa24d9.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